aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2015-12-09 21:15:28 +0100
committerAndy Polyakov <appro@openssl.org>2015-12-10 11:59:49 +0100
commit72bb2f64fc67dc644f302a07953900becced011f (patch)
treea4db39ca29ac6a02b372e11899a15b870dc977d0 /include
parent7dcb21869bec05d574d55e4c29daa5d58480d2a1 (diff)
downloadopenssl-72bb2f64fc67dc644f302a07953900becced011f.tar.gz
Add ChaCha20-Poly1305 and ChaCha20 NIDs.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
-rw-r--r--include/openssl/obj_mac.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index 4388f70931..060126b56c 100644
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -4301,6 +4301,14 @@
#define LN_aes_256_cbc_hmac_sha256 "aes-256-cbc-hmac-sha256"
#define NID_aes_256_cbc_hmac_sha256 950
+#define SN_chacha20_poly1305 "ChaCha20-Poly1305"
+#define LN_chacha20_poly1305 "chacha20-poly1305"
+#define NID_chacha20_poly1305 1018
+
+#define SN_chacha20 "ChaCha20"
+#define LN_chacha20 "chacha20"
+#define NID_chacha20 1019
+
#define SN_dhpublicnumber "dhpublicnumber"
#define LN_dhpublicnumber "X9.42 DH"
#define NID_dhpublicnumber 920