summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ec
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/ec')
-rw-r--r--src/lib/libcrypto/ec/ec_asn1.c41
1 files changed, 37 insertions, 4 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 11d924d30f..c0ef6f40e4 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec_asn1.c,v 1.11 2015/02/10 04:01:26 jsing Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.12 2015/02/10 05:43:09 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -205,7 +205,18 @@ ASN1_SEQUENCE(X9_62_PENTANOMIAL) = {
205} ASN1_SEQUENCE_END(X9_62_PENTANOMIAL) 205} ASN1_SEQUENCE_END(X9_62_PENTANOMIAL)
206 206
207DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL) 207DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
208IMPLEMENT_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL) 208
209X9_62_PENTANOMIAL *
210X9_62_PENTANOMIAL_new(void)
211{
212 return (X9_62_PENTANOMIAL*)ASN1_item_new(&X9_62_PENTANOMIAL_it);
213}
214
215void
216X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a)
217{
218 ASN1_item_free((ASN1_VALUE *)a, &X9_62_PENTANOMIAL_it);
219}
209 220
210ASN1_ADB_TEMPLATE(char_two_def) = ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.other, ASN1_ANY); 221ASN1_ADB_TEMPLATE(char_two_def) = ASN1_SIMPLE(X9_62_CHARACTERISTIC_TWO, p.other, ASN1_ANY);
211 222
@@ -221,7 +232,18 @@ ASN1_SEQUENCE(X9_62_CHARACTERISTIC_TWO) = {
221 ASN1_ADB_OBJECT(X9_62_CHARACTERISTIC_TWO) 232 ASN1_ADB_OBJECT(X9_62_CHARACTERISTIC_TWO)
222} ASN1_SEQUENCE_END(X9_62_CHARACTERISTIC_TWO) 233} ASN1_SEQUENCE_END(X9_62_CHARACTERISTIC_TWO)
223DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO) 234DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
224IMPLEMENT_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO) 235
236X9_62_CHARACTERISTIC_TWO *
237X9_62_CHARACTERISTIC_TWO_new(void)
238{
239 return (X9_62_CHARACTERISTIC_TWO*)ASN1_item_new(&X9_62_CHARACTERISTIC_TWO_it);
240}
241
242void
243X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a)
244{
245 ASN1_item_free((ASN1_VALUE *)a, &X9_62_CHARACTERISTIC_TWO_it);
246}
225ASN1_ADB_TEMPLATE(fieldID_def) = ASN1_SIMPLE(X9_62_FIELDID, p.other, ASN1_ANY); 247ASN1_ADB_TEMPLATE(fieldID_def) = ASN1_SIMPLE(X9_62_FIELDID, p.other, ASN1_ANY);
226 248
227ASN1_ADB(X9_62_FIELDID) = { 249ASN1_ADB(X9_62_FIELDID) = {
@@ -249,7 +271,18 @@ ASN1_SEQUENCE(ECPARAMETERS) = {
249 ASN1_OPT(ECPARAMETERS, cofactor, ASN1_INTEGER) 271 ASN1_OPT(ECPARAMETERS, cofactor, ASN1_INTEGER)
250} ASN1_SEQUENCE_END(ECPARAMETERS) 272} ASN1_SEQUENCE_END(ECPARAMETERS)
251DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS) 273DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
252IMPLEMENT_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS) 274
275ECPARAMETERS *
276ECPARAMETERS_new(void)
277{
278 return (ECPARAMETERS*)ASN1_item_new(&ECPARAMETERS_it);
279}
280
281void
282ECPARAMETERS_free(ECPARAMETERS *a)
283{
284 ASN1_item_free((ASN1_VALUE *)a, &ECPARAMETERS_it);
285}
253 286
254ASN1_CHOICE(ECPKPARAMETERS) = { 287ASN1_CHOICE(ECPKPARAMETERS) = {
255 ASN1_SIMPLE(ECPKPARAMETERS, value.named_curve, ASN1_OBJECT), 288 ASN1_SIMPLE(ECPKPARAMETERS, value.named_curve, ASN1_OBJECT),