aboutsummaryrefslogtreecommitdiff
path: root/include/openssl/obj_mac.h
diff options
context:
space:
mode:
authorDmitry Belyavskiy <beldmit@gmail.com>2015-10-04 12:11:26 +0300
committerMatt Caswell <matt@openssl.org>2015-10-05 21:55:10 +0100
commit52ee3ed3a11024ab6e11c5705da6c3ba17cf7d98 (patch)
tree29d13313197e181865e6bb7c6c97b49006abf495 /include/openssl/obj_mac.h
parent52a48f9eed73503c691056b5832b3eb04b95ea00 (diff)
downloadopenssl-52ee3ed3a11024ab6e11c5705da6c3ba17cf7d98.zip
openssl-52ee3ed3a11024ab6e11c5705da6c3ba17cf7d98.tar.gz
openssl-52ee3ed3a11024ab6e11c5705da6c3ba17cf7d98.tar.bz2
New cipher and cipher modes standardized in Russia
This change introduces short names and NIDs for Russian GOST ciphers according to GOST R 34.13-2015 Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'include/openssl/obj_mac.h')
-rw-r--r--include/openssl/obj_mac.h27
1 files changed, 27 insertions, 0 deletions
diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index fdf5b62..4388f70 100644
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -3735,6 +3735,15 @@
#define SN_gost89_cnt_12 "gost89-cnt-12"
#define NID_gost89_cnt_12 975
+#define SN_gost89_cbc "gost89-cbc"
+#define NID_gost89_cbc 1009
+
+#define SN_gost89_ecb "gost89-ecb"
+#define NID_gost89_ecb 1010
+
+#define SN_gost89_ctr "gost89-ctr"
+#define NID_gost89_ctr 1011
+
#define SN_id_Gost28147_89_MAC "gost-mac"
#define LN_id_Gost28147_89_MAC "GOST 28147-89 MAC"
#define NID_id_Gost28147_89_MAC 815
@@ -4053,6 +4062,24 @@
#define NID_issuerSignTool 1008
#define OBJ_issuerSignTool OBJ_member_body,643L,100L,112L
+#define SN_grasshopper_ecb "grasshopper-ecb"
+#define NID_grasshopper_ecb 1012
+
+#define SN_grasshopper_ctr "grasshopper-ctr"
+#define NID_grasshopper_ctr 1013
+
+#define SN_grasshopper_ofb "grasshopper-ofb"
+#define NID_grasshopper_ofb 1014
+
+#define SN_grasshopper_cbc "grasshopper-cbc"
+#define NID_grasshopper_cbc 1015
+
+#define SN_grasshopper_cfb "grasshopper-cfb"
+#define NID_grasshopper_cfb 1016
+
+#define SN_grasshopper_mac "grasshopper-mac"
+#define NID_grasshopper_mac 1017
+
#define SN_camellia_128_cbc "CAMELLIA-128-CBC"
#define LN_camellia_128_cbc "camellia-128-cbc"
#define NID_camellia_128_cbc 751