1 diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
2 index 60c3826799d..6d66d07fc13 100644
3 --- a/crypto/objects/obj_dat.h
4 +++ b/crypto/objects/obj_dat.h
9 -static const unsigned char so[7626] = {
10 +static const unsigned char so[7746] = {
11 0x2A,0x86,0x48,0x86,0xF7,0x0D, /* [ 0] OBJ_rsadsi */
12 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x01, /* [ 6] OBJ_pkcs */
13 0x2A,0x86,0x48,0x86,0xF7,0x0D,0x02,0x02, /* [ 13] OBJ_md2 */
14 @@ -1060,9 +1060,23 @@ static const unsigned char so[7626] = {
15 0x2B,0x6F, /* [ 7610] OBJ_ieee */
16 0x2B,0x6F,0x02,0x8C,0x53, /* [ 7612] OBJ_ieee_siswg */
17 0x2A,0x81,0x1C,0xCF,0x55,0x01,0x82,0x2D, /* [ 7617] OBJ_sm2 */
18 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x05,0x01, /* [ 7625] OBJ_id_tc26_cipher_gostr3412_2015_magma */
19 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x05,0x01,0x01, /* [ 7633] OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm */
20 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x05,0x01,0x02, /* [ 7642] OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac */
21 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x05,0x02, /* [ 7651] OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik */
22 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x05,0x02,0x01, /* [ 7659] OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm */
23 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x05,0x02,0x02, /* [ 7668] OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac */
24 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x07, /* [ 7677] OBJ_id_tc26_wrap */
25 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x07,0x01, /* [ 7684] OBJ_id_tc26_wrap_gostr3412_2015_magma */
26 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x07,0x01,0x01, /* [ 7692] OBJ_id_tc26_wrap_gostr3412_2015_magma_kexp15 */
27 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x07,0x02, /* [ 7701] OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik */
28 + 0x2A,0x85,0x03,0x07,0x01,0x01,0x07,0x01,0x01, /* [ 7709] OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 */
29 + 0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x02, /* [ 7718] OBJ_id_tc26_gost_3410_2012_256_paramSetB */
30 + 0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x03, /* [ 7727] OBJ_id_tc26_gost_3410_2012_256_paramSetC */
31 + 0x2A,0x85,0x03,0x07,0x01,0x02,0x01,0x01,0x04, /* [ 7736] OBJ_id_tc26_gost_3410_2012_256_paramSetD */
36 static const ASN1_OBJECT nid_objs[NUM_NID] = {
37 {"UNDEF", "undefined", NID_undef},
38 {"rsadsi", "RSA Data Security, Inc.", NID_rsadsi, 6, &so[0]},
39 @@ -2237,9 +2251,29 @@ static const ASN1_OBJECT nid_objs[NUM_NID] = {
40 {"ieee", "ieee", NID_ieee, 2, &so[7610]},
41 {"ieee-siswg", "IEEE Security in Storage Working Group", NID_ieee_siswg, 5, &so[7612]},
42 {"SM2", "sm2", NID_sm2, 8, &so[7617]},
43 + {"id-tc26-cipher-gostr3412-2015-magma", "id-tc26-cipher-gostr3412-2015-magma", NID_id_tc26_cipher_gostr3412_2015_magma, 8, &so[7625]},
44 + {"id-tc26-cipher-gostr3412-2015-magma-ctracpkm", "id-tc26-cipher-gostr3412-2015-magma-ctracpkm", NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm, 9, &so[7633]},
45 + {"id-tc26-cipher-gostr3412-2015-magma-ctracpkm-omac", "id-tc26-cipher-gostr3412-2015-magma-ctracpkm-omac", NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac, 9, &so[7642]},
46 + {"id-tc26-cipher-gostr3412-2015-kuznyechik", "id-tc26-cipher-gostr3412-2015-kuznyechik", NID_id_tc26_cipher_gostr3412_2015_kuznyechik, 8, &so[7651]},
47 + {"id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm", "id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm", NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm, 9, &so[7659]},
48 + {"id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm-omac", "id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm-omac", NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac, 9, &so[7668]},
49 + {"id-tc26-wrap", "id-tc26-wrap", NID_id_tc26_wrap, 7, &so[7677]},
50 + {"id-tc26-wrap-gostr3412-2015-magma", "id-tc26-wrap-gostr3412-2015-magma", NID_id_tc26_wrap_gostr3412_2015_magma, 8, &so[7684]},
51 + {"id-tc26-wrap-gostr3412-2015-magma-kexp15", "id-tc26-wrap-gostr3412-2015-magma-kexp15", NID_id_tc26_wrap_gostr3412_2015_magma_kexp15, 9, &so[7692]},
52 + {"id-tc26-wrap-gostr3412-2015-kuznyechik", "id-tc26-wrap-gostr3412-2015-kuznyechik", NID_id_tc26_wrap_gostr3412_2015_kuznyechik, 8, &so[7701]},
53 + {"id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15", "id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15", NID_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15, 9, &so[7709]},
54 + {"id-tc26-gost-3410-2012-256-paramSetB", "GOST R 34.10-2012 (256 bit) ParamSet B", NID_id_tc26_gost_3410_2012_256_paramSetB, 9, &so[7718]},
55 + {"id-tc26-gost-3410-2012-256-paramSetC", "GOST R 34.10-2012 (256 bit) ParamSet C", NID_id_tc26_gost_3410_2012_256_paramSetC, 9, &so[7727]},
56 + {"id-tc26-gost-3410-2012-256-paramSetD", "GOST R 34.10-2012 (256 bit) ParamSet D", NID_id_tc26_gost_3410_2012_256_paramSetD, 9, &so[7736]},
57 + {"magma-ecb", "magma-ecb", NID_magma_ecb},
58 + {"magma-ctr", "magma-ctr", NID_magma_ctr},
59 + {"magma-ofb", "magma-ofb", NID_magma_ofb},
60 + {"magma-cbc", "magma-cbc", NID_magma_cbc},
61 + {"magma-cfb", "magma-cfb", NID_magma_cfb},
62 + {"magma-mac", "magma-mac", NID_magma_mac},
67 static const unsigned int sn_objs[NUM_SN] = {
69 419, /* "AES-128-CBC" */
70 @@ -2999,6 +3033,12 @@ static const unsigned int sn_objs[NUM_SN] = {
71 977, /* "id-tc26-algorithms" */
72 990, /* "id-tc26-cipher" */
73 1001, /* "id-tc26-cipher-constants" */
74 + 1176, /* "id-tc26-cipher-gostr3412-2015-kuznyechik" */
75 + 1177, /* "id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm" */
76 + 1178, /* "id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm-omac" */
77 + 1173, /* "id-tc26-cipher-gostr3412-2015-magma" */
78 + 1174, /* "id-tc26-cipher-gostr3412-2015-magma-ctracpkm" */
79 + 1175, /* "id-tc26-cipher-gostr3412-2015-magma-ctracpkm-omac" */
80 994, /* "id-tc26-constants" */
81 981, /* "id-tc26-digest" */
82 1000, /* "id-tc26-digest-constants" */
83 @@ -3006,6 +3046,9 @@ static const unsigned int sn_objs[NUM_SN] = {
84 1003, /* "id-tc26-gost-28147-param-Z" */
85 1147, /* "id-tc26-gost-3410-2012-256-constants" */
86 1148, /* "id-tc26-gost-3410-2012-256-paramSetA" */
87 + 1184, /* "id-tc26-gost-3410-2012-256-paramSetB" */
88 + 1185, /* "id-tc26-gost-3410-2012-256-paramSetC" */
89 + 1186, /* "id-tc26-gost-3410-2012-256-paramSetD" */
90 996, /* "id-tc26-gost-3410-2012-512-constants" */
91 998, /* "id-tc26-gost-3410-2012-512-paramSetA" */
92 999, /* "id-tc26-gost-3410-2012-512-paramSetB" */
93 @@ -3019,6 +3062,11 @@ static const unsigned int sn_objs[NUM_SN] = {
94 984, /* "id-tc26-signwithdigest" */
95 985, /* "id-tc26-signwithdigest-gost3410-2012-256" */
96 986, /* "id-tc26-signwithdigest-gost3410-2012-512" */
97 + 1179, /* "id-tc26-wrap" */
98 + 1182, /* "id-tc26-wrap-gostr3412-2015-kuznyechik" */
99 + 1183, /* "id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15" */
100 + 1180, /* "id-tc26-wrap-gostr3412-2015-magma" */
101 + 1181, /* "id-tc26-wrap-gostr3412-2015-magma-kexp15" */
102 676, /* "identified-organization" */
104 1171, /* "ieee-siswg" */
105 @@ -3045,6 +3093,12 @@ static const unsigned int sn_objs[NUM_SN] = {
106 476, /* "lastModifiedTime" */
107 157, /* "localKeyID" */
108 480, /* "mXRecord" */
109 + 1190, /* "magma-cbc" */
110 + 1191, /* "magma-cfb" */
111 + 1188, /* "magma-ctr" */
112 + 1187, /* "magma-ecb" */
113 + 1192, /* "magma-mac" */
114 + 1189, /* "magma-ofb" */
116 493, /* "mailPreferenceOption" */
118 @@ -3407,7 +3461,7 @@ static const unsigned int sn_objs[NUM_SN] = {
119 1093, /* "x509ExtAdmission" */
124 static const unsigned int ln_objs[NUM_LN] = {
125 363, /* "AD Time Stamping" */
126 405, /* "ANSI X9.62" */
127 @@ -3464,6 +3518,9 @@ static const unsigned int ln_objs[NUM_LN] = {
128 811, /* "GOST R 34.10-2001" */
129 817, /* "GOST R 34.10-2001 DH" */
130 1148, /* "GOST R 34.10-2012 (256 bit) ParamSet A" */
131 + 1184, /* "GOST R 34.10-2012 (256 bit) ParamSet B" */
132 + 1185, /* "GOST R 34.10-2012 (256 bit) ParamSet C" */
133 + 1186, /* "GOST R 34.10-2012 (256 bit) ParamSet D" */
134 998, /* "GOST R 34.10-2012 (512 bit) ParamSet A" */
135 999, /* "GOST R 34.10-2012 (512 bit) ParamSet B" */
136 1149, /* "GOST R 34.10-2012 (512 bit) ParamSet C" */
137 @@ -4154,6 +4211,12 @@ static const unsigned int ln_objs[NUM_LN] = {
138 977, /* "id-tc26-algorithms" */
139 990, /* "id-tc26-cipher" */
140 1001, /* "id-tc26-cipher-constants" */
141 + 1176, /* "id-tc26-cipher-gostr3412-2015-kuznyechik" */
142 + 1177, /* "id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm" */
143 + 1178, /* "id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm-omac" */
144 + 1173, /* "id-tc26-cipher-gostr3412-2015-magma" */
145 + 1174, /* "id-tc26-cipher-gostr3412-2015-magma-ctracpkm" */
146 + 1175, /* "id-tc26-cipher-gostr3412-2015-magma-ctracpkm-omac" */
147 994, /* "id-tc26-constants" */
148 981, /* "id-tc26-digest" */
149 1000, /* "id-tc26-digest-constants" */
150 @@ -4164,6 +4227,11 @@ static const unsigned int ln_objs[NUM_LN] = {
151 978, /* "id-tc26-sign" */
152 995, /* "id-tc26-sign-constants" */
153 984, /* "id-tc26-signwithdigest" */
154 + 1179, /* "id-tc26-wrap" */
155 + 1182, /* "id-tc26-wrap-gostr3412-2015-kuznyechik" */
156 + 1183, /* "id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15" */
157 + 1180, /* "id-tc26-wrap-gostr3412-2015-magma" */
158 + 1181, /* "id-tc26-wrap-gostr3412-2015-magma-kexp15" */
162 @@ -4201,6 +4269,12 @@ static const unsigned int ln_objs[NUM_LN] = {
163 157, /* "localKeyID" */
164 15, /* "localityName" */
165 480, /* "mXRecord" */
166 + 1190, /* "magma-cbc" */
167 + 1191, /* "magma-cfb" */
168 + 1188, /* "magma-ctr" */
169 + 1187, /* "magma-ecb" */
170 + 1192, /* "magma-mac" */
171 + 1189, /* "magma-ofb" */
172 493, /* "mailPreferenceOption" */
175 @@ -4575,7 +4649,7 @@ static const unsigned int ln_objs[NUM_LN] = {
176 125, /* "zlib compression" */
179 -#define NUM_OBJ 1055
180 +#define NUM_OBJ 1069
181 static const unsigned int obj_objs[NUM_OBJ] = {
184 @@ -4975,6 +5049,7 @@ static const unsigned int obj_objs[NUM_OBJ] = {
185 987, /* OBJ_id_tc26_mac 1 2 643 7 1 1 4 */
186 990, /* OBJ_id_tc26_cipher 1 2 643 7 1 1 5 */
187 991, /* OBJ_id_tc26_agreement 1 2 643 7 1 1 6 */
188 + 1179, /* OBJ_id_tc26_wrap 1 2 643 7 1 1 7 */
189 995, /* OBJ_id_tc26_sign_constants 1 2 643 7 1 2 1 */
190 1000, /* OBJ_id_tc26_digest_constants 1 2 643 7 1 2 2 */
191 1001, /* OBJ_id_tc26_cipher_constants 1 2 643 7 1 2 5 */
192 @@ -5063,8 +5138,12 @@ static const unsigned int obj_objs[NUM_OBJ] = {
193 986, /* OBJ_id_tc26_signwithdigest_gost3410_2012_512 1 2 643 7 1 1 3 3 */
194 988, /* OBJ_id_tc26_hmac_gost_3411_2012_256 1 2 643 7 1 1 4 1 */
195 989, /* OBJ_id_tc26_hmac_gost_3411_2012_512 1 2 643 7 1 1 4 2 */
196 + 1173, /* OBJ_id_tc26_cipher_gostr3412_2015_magma 1 2 643 7 1 1 5 1 */
197 + 1176, /* OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik 1 2 643 7 1 1 5 2 */
198 992, /* OBJ_id_tc26_agreement_gost_3410_2012_256 1 2 643 7 1 1 6 1 */
199 993, /* OBJ_id_tc26_agreement_gost_3410_2012_512 1 2 643 7 1 1 6 2 */
200 + 1180, /* OBJ_id_tc26_wrap_gostr3412_2015_magma 1 2 643 7 1 1 7 1 */
201 + 1182, /* OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik 1 2 643 7 1 1 7 2 */
202 1147, /* OBJ_id_tc26_gost_3410_2012_256_constants 1 2 643 7 1 2 1 1 */
203 996, /* OBJ_id_tc26_gost_3410_2012_512_constants 1 2 643 7 1 2 1 2 */
204 1002, /* OBJ_id_tc26_gost_28147_constants 1 2 643 7 1 2 5 1 */
205 @@ -5270,7 +5349,16 @@ static const unsigned int obj_objs[NUM_OBJ] = {
206 1120, /* OBJ_aria_128_ccm 1 2 410 200046 1 1 37 */
207 1121, /* OBJ_aria_192_ccm 1 2 410 200046 1 1 38 */
208 1122, /* OBJ_aria_256_ccm 1 2 410 200046 1 1 39 */
209 + 1174, /* OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm 1 2 643 7 1 1 5 1 1 */
210 + 1175, /* OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac 1 2 643 7 1 1 5 1 2 */
211 + 1177, /* OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm 1 2 643 7 1 1 5 2 1 */
212 + 1178, /* OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac 1 2 643 7 1 1 5 2 2 */
213 + 1181, /* OBJ_id_tc26_wrap_gostr3412_2015_magma_kexp15 1 2 643 7 1 1 7 1 1 */
214 + 1183, /* OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 1 2 643 7 1 1 7 1 1 */
215 1148, /* OBJ_id_tc26_gost_3410_2012_256_paramSetA 1 2 643 7 1 2 1 1 1 */
216 + 1184, /* OBJ_id_tc26_gost_3410_2012_256_paramSetB 1 2 643 7 1 2 1 1 2 */
217 + 1185, /* OBJ_id_tc26_gost_3410_2012_256_paramSetC 1 2 643 7 1 2 1 1 3 */
218 + 1186, /* OBJ_id_tc26_gost_3410_2012_256_paramSetD 1 2 643 7 1 2 1 1 4 */
219 997, /* OBJ_id_tc26_gost_3410_2012_512_paramSetTest 1 2 643 7 1 2 1 2 0 */
220 998, /* OBJ_id_tc26_gost_3410_2012_512_paramSetA 1 2 643 7 1 2 1 2 1 */
221 999, /* OBJ_id_tc26_gost_3410_2012_512_paramSetB 1 2 643 7 1 2 1 2 2 */
222 diff --git a/crypto/objects/obj_mac.num b/crypto/objects/obj_mac.num
223 index ca8fdfba48c..57caf3c06dc 100644
224 --- a/crypto/objects/obj_mac.num
225 +++ b/crypto/objects/obj_mac.num
226 @@ -1170,3 +1170,23 @@ uacurve9 1169
230 +id_tc26_cipher_gostr3412_2015_magma 1173
231 +id_tc26_cipher_gostr3412_2015_magma_ctracpkm 1174
232 +id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac 1175
233 +id_tc26_cipher_gostr3412_2015_kuznyechik 1176
234 +id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm 1177
235 +id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac 1178
237 +id_tc26_wrap_gostr3412_2015_magma 1180
238 +id_tc26_wrap_gostr3412_2015_magma_kexp15 1181
239 +id_tc26_wrap_gostr3412_2015_kuznyechik 1182
240 +id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 1183
241 +id_tc26_gost_3410_2012_256_paramSetB 1184
242 +id_tc26_gost_3410_2012_256_paramSetC 1185
243 +id_tc26_gost_3410_2012_256_paramSetD 1186
250 diff --git a/crypto/objects/objects.txt b/crypto/objects/objects.txt
251 index e565864a487..d4d1daa5185 100644
252 --- a/crypto/objects/objects.txt
253 +++ b/crypto/objects/objects.txt
254 @@ -1339,16 +1339,31 @@ id-tc26-mac 1 : id-tc26-hmac-gost-3411-2012-256 : HMAC GOST 34.11-2012 256 bit
255 id-tc26-mac 2 : id-tc26-hmac-gost-3411-2012-512 : HMAC GOST 34.11-2012 512 bit
257 id-tc26-algorithms 5 : id-tc26-cipher
258 +id-tc26-cipher 1 : id-tc26-cipher-gostr3412-2015-magma
259 +id-tc26-cipher-gostr3412-2015-magma 1 : id-tc26-cipher-gostr3412-2015-magma-ctracpkm
260 +id-tc26-cipher-gostr3412-2015-magma 2 : id-tc26-cipher-gostr3412-2015-magma-ctracpkm-omac
261 +id-tc26-cipher 2 : id-tc26-cipher-gostr3412-2015-kuznyechik
262 +id-tc26-cipher-gostr3412-2015-kuznyechik 1 : id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm
263 +id-tc26-cipher-gostr3412-2015-kuznyechik 2 : id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm-omac
265 id-tc26-algorithms 6 : id-tc26-agreement
266 id-tc26-agreement 1 : id-tc26-agreement-gost-3410-2012-256
267 id-tc26-agreement 2 : id-tc26-agreement-gost-3410-2012-512
269 +id-tc26-algorithms 7 : id-tc26-wrap
270 +id-tc26-wrap 1 : id-tc26-wrap-gostr3412-2015-magma
271 +id-tc26-wrap-gostr3412-2015-magma 1 : id-tc26-wrap-gostr3412-2015-magma-kexp15
272 +id-tc26-wrap 2 : id-tc26-wrap-gostr3412-2015-kuznyechik
273 +id-tc26-wrap-gostr3412-2015-magma 1 : id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15
275 id-tc26 2 : id-tc26-constants
277 id-tc26-constants 1 : id-tc26-sign-constants
278 id-tc26-sign-constants 1: id-tc26-gost-3410-2012-256-constants
279 id-tc26-gost-3410-2012-256-constants 1 : id-tc26-gost-3410-2012-256-paramSetA: GOST R 34.10-2012 (256 bit) ParamSet A
280 +id-tc26-gost-3410-2012-256-constants 2 : id-tc26-gost-3410-2012-256-paramSetB: GOST R 34.10-2012 (256 bit) ParamSet B
281 +id-tc26-gost-3410-2012-256-constants 3 : id-tc26-gost-3410-2012-256-paramSetC: GOST R 34.10-2012 (256 bit) ParamSet C
282 +id-tc26-gost-3410-2012-256-constants 4 : id-tc26-gost-3410-2012-256-paramSetD: GOST R 34.10-2012 (256 bit) ParamSet D
283 id-tc26-sign-constants 2: id-tc26-gost-3410-2012-512-constants
284 id-tc26-gost-3410-2012-512-constants 0 : id-tc26-gost-3410-2012-512-paramSetTest: GOST R 34.10-2012 (512 bit) testing parameter set
285 id-tc26-gost-3410-2012-512-constants 1 : id-tc26-gost-3410-2012-512-paramSetA: GOST R 34.10-2012 (512 bit) ParamSet A
286 @@ -1374,6 +1389,14 @@ member-body 643 100 112 : issuerSignTool : Signing Tool of Issuer
290 +#GOST R34.13-2015 Magma
298 # Definitions for Camellia cipher - CBC MODE
300 1 2 392 200011 61 1 1 1 2 : CAMELLIA-128-CBC : camellia-128-cbc
301 diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
302 index 2078dc49955..e95e369a0cc 100644
303 --- a/include/openssl/obj_mac.h
304 +++ b/include/openssl/obj_mac.h
305 @@ -4218,6 +4218,30 @@
306 #define NID_id_tc26_cipher 990
307 #define OBJ_id_tc26_cipher OBJ_id_tc26_algorithms,5L
309 +#define SN_id_tc26_cipher_gostr3412_2015_magma "id-tc26-cipher-gostr3412-2015-magma"
310 +#define NID_id_tc26_cipher_gostr3412_2015_magma 1173
311 +#define OBJ_id_tc26_cipher_gostr3412_2015_magma OBJ_id_tc26_cipher,1L
313 +#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm "id-tc26-cipher-gostr3412-2015-magma-ctracpkm"
314 +#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm 1174
315 +#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm OBJ_id_tc26_cipher_gostr3412_2015_magma,1L
317 +#define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac "id-tc26-cipher-gostr3412-2015-magma-ctracpkm-omac"
318 +#define NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac 1175
319 +#define OBJ_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac OBJ_id_tc26_cipher_gostr3412_2015_magma,2L
321 +#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik "id-tc26-cipher-gostr3412-2015-kuznyechik"
322 +#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik 1176
323 +#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik OBJ_id_tc26_cipher,2L
325 +#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm "id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm"
326 +#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm 1177
327 +#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik,1L
329 +#define SN_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac "id-tc26-cipher-gostr3412-2015-kuznyechik-ctracpkm-omac"
330 +#define NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac 1178
331 +#define OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm_omac OBJ_id_tc26_cipher_gostr3412_2015_kuznyechik,2L
333 #define SN_id_tc26_agreement "id-tc26-agreement"
334 #define NID_id_tc26_agreement 991
335 #define OBJ_id_tc26_agreement OBJ_id_tc26_algorithms,6L
336 @@ -4230,6 +4254,26 @@
337 #define NID_id_tc26_agreement_gost_3410_2012_512 993
338 #define OBJ_id_tc26_agreement_gost_3410_2012_512 OBJ_id_tc26_agreement,2L
340 +#define SN_id_tc26_wrap "id-tc26-wrap"
341 +#define NID_id_tc26_wrap 1179
342 +#define OBJ_id_tc26_wrap OBJ_id_tc26_algorithms,7L
344 +#define SN_id_tc26_wrap_gostr3412_2015_magma "id-tc26-wrap-gostr3412-2015-magma"
345 +#define NID_id_tc26_wrap_gostr3412_2015_magma 1180
346 +#define OBJ_id_tc26_wrap_gostr3412_2015_magma OBJ_id_tc26_wrap,1L
348 +#define SN_id_tc26_wrap_gostr3412_2015_magma_kexp15 "id-tc26-wrap-gostr3412-2015-magma-kexp15"
349 +#define NID_id_tc26_wrap_gostr3412_2015_magma_kexp15 1181
350 +#define OBJ_id_tc26_wrap_gostr3412_2015_magma_kexp15 OBJ_id_tc26_wrap_gostr3412_2015_magma,1L
352 +#define SN_id_tc26_wrap_gostr3412_2015_kuznyechik "id-tc26-wrap-gostr3412-2015-kuznyechik"
353 +#define NID_id_tc26_wrap_gostr3412_2015_kuznyechik 1182
354 +#define OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik OBJ_id_tc26_wrap,2L
356 +#define SN_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 "id-tc26-wrap-gostr3412-2015-kuznyechik-kexp15"
357 +#define NID_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 1183
358 +#define OBJ_id_tc26_wrap_gostr3412_2015_kuznyechik_kexp15 OBJ_id_tc26_wrap_gostr3412_2015_magma,1L
360 #define SN_id_tc26_constants "id-tc26-constants"
361 #define NID_id_tc26_constants 994
362 #define OBJ_id_tc26_constants OBJ_id_tc26,2L
363 @@ -4247,6 +4291,21 @@
364 #define NID_id_tc26_gost_3410_2012_256_paramSetA 1148
365 #define OBJ_id_tc26_gost_3410_2012_256_paramSetA OBJ_id_tc26_gost_3410_2012_256_constants,1L
367 +#define SN_id_tc26_gost_3410_2012_256_paramSetB "id-tc26-gost-3410-2012-256-paramSetB"
368 +#define LN_id_tc26_gost_3410_2012_256_paramSetB "GOST R 34.10-2012 (256 bit) ParamSet B"
369 +#define NID_id_tc26_gost_3410_2012_256_paramSetB 1184
370 +#define OBJ_id_tc26_gost_3410_2012_256_paramSetB OBJ_id_tc26_gost_3410_2012_256_constants,2L
372 +#define SN_id_tc26_gost_3410_2012_256_paramSetC "id-tc26-gost-3410-2012-256-paramSetC"
373 +#define LN_id_tc26_gost_3410_2012_256_paramSetC "GOST R 34.10-2012 (256 bit) ParamSet C"
374 +#define NID_id_tc26_gost_3410_2012_256_paramSetC 1185
375 +#define OBJ_id_tc26_gost_3410_2012_256_paramSetC OBJ_id_tc26_gost_3410_2012_256_constants,3L
377 +#define SN_id_tc26_gost_3410_2012_256_paramSetD "id-tc26-gost-3410-2012-256-paramSetD"
378 +#define LN_id_tc26_gost_3410_2012_256_paramSetD "GOST R 34.10-2012 (256 bit) ParamSet D"
379 +#define NID_id_tc26_gost_3410_2012_256_paramSetD 1186
380 +#define OBJ_id_tc26_gost_3410_2012_256_paramSetD OBJ_id_tc26_gost_3410_2012_256_constants,4L
382 #define SN_id_tc26_gost_3410_2012_512_constants "id-tc26-gost-3410-2012-512-constants"
383 #define NID_id_tc26_gost_3410_2012_512_constants 996
384 #define OBJ_id_tc26_gost_3410_2012_512_constants OBJ_id_tc26_sign_constants,2L
385 @@ -4331,6 +4390,24 @@
386 #define SN_grasshopper_mac "grasshopper-mac"
387 #define NID_grasshopper_mac 1017
389 +#define SN_magma_ecb "magma-ecb"
390 +#define NID_magma_ecb 1187
392 +#define SN_magma_ctr "magma-ctr"
393 +#define NID_magma_ctr 1188
395 +#define SN_magma_ofb "magma-ofb"
396 +#define NID_magma_ofb 1189
398 +#define SN_magma_cbc "magma-cbc"
399 +#define NID_magma_cbc 1190
401 +#define SN_magma_cfb "magma-cfb"
402 +#define NID_magma_cfb 1191
404 +#define SN_magma_mac "magma-mac"
405 +#define NID_magma_mac 1192
407 #define SN_camellia_128_cbc "CAMELLIA-128-CBC"
408 #define LN_camellia_128_cbc "camellia-128-cbc"
409 #define NID_camellia_128_cbc 751