diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c index f937672d67..5aeb561531 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.19 2015/10/16 15:09:28 jsing Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.20 2015/10/16 15:12:30 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -232,7 +232,8 @@ const ASN1_ITEM X9_62_PENTANOMIAL_it = { | |||
232 | .sname = "X9_62_PENTANOMIAL", | 232 | .sname = "X9_62_PENTANOMIAL", |
233 | }; | 233 | }; |
234 | 234 | ||
235 | DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL) | 235 | X9_62_PENTANOMIAL *X9_62_PENTANOMIAL_new(void); |
236 | void X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a); | ||
236 | 237 | ||
237 | X9_62_PENTANOMIAL * | 238 | X9_62_PENTANOMIAL * |
238 | X9_62_PENTANOMIAL_new(void) | 239 | X9_62_PENTANOMIAL_new(void) |
@@ -333,7 +334,8 @@ const ASN1_ITEM X9_62_CHARACTERISTIC_TWO_it = { | |||
333 | .size = sizeof(X9_62_CHARACTERISTIC_TWO), | 334 | .size = sizeof(X9_62_CHARACTERISTIC_TWO), |
334 | .sname = "X9_62_CHARACTERISTIC_TWO", | 335 | .sname = "X9_62_CHARACTERISTIC_TWO", |
335 | }; | 336 | }; |
336 | DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO) | 337 | X9_62_CHARACTERISTIC_TWO *X9_62_CHARACTERISTIC_TWO_new(void); |
338 | void X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a); | ||
337 | 339 | ||
338 | X9_62_CHARACTERISTIC_TWO * | 340 | X9_62_CHARACTERISTIC_TWO * |
339 | X9_62_CHARACTERISTIC_TWO_new(void) | 341 | X9_62_CHARACTERISTIC_TWO_new(void) |
@@ -504,7 +506,8 @@ const ASN1_ITEM ECPARAMETERS_it = { | |||
504 | .size = sizeof(ECPARAMETERS), | 506 | .size = sizeof(ECPARAMETERS), |
505 | .sname = "ECPARAMETERS", | 507 | .sname = "ECPARAMETERS", |
506 | }; | 508 | }; |
507 | DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS) | 509 | ECPARAMETERS *ECPARAMETERS_new(void); |
510 | void ECPARAMETERS_free(ECPARAMETERS *a); | ||
508 | 511 | ||
509 | ECPARAMETERS * | 512 | ECPARAMETERS * |
510 | ECPARAMETERS_new(void) | 513 | ECPARAMETERS_new(void) |
@@ -552,7 +555,11 @@ const ASN1_ITEM ECPKPARAMETERS_it = { | |||
552 | .sname = "ECPKPARAMETERS", | 555 | .sname = "ECPKPARAMETERS", |
553 | }; | 556 | }; |
554 | 557 | ||
555 | DECLARE_ASN1_FUNCTIONS_const(ECPKPARAMETERS) | 558 | ECPKPARAMETERS *ECPKPARAMETERS_new(void); |
559 | void ECPKPARAMETERS_free(ECPKPARAMETERS *a); | ||
560 | ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len); | ||
561 | int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out); | ||
562 | extern const ASN1_ITEM ECPKPARAMETERS_it; | ||
556 | 563 | ||
557 | ECPKPARAMETERS * | 564 | ECPKPARAMETERS * |
558 | d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) | 565 | d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len) |
@@ -620,7 +627,11 @@ const ASN1_ITEM EC_PRIVATEKEY_it = { | |||
620 | .sname = "EC_PRIVATEKEY", | 627 | .sname = "EC_PRIVATEKEY", |
621 | }; | 628 | }; |
622 | 629 | ||
623 | DECLARE_ASN1_FUNCTIONS_const(EC_PRIVATEKEY) | 630 | EC_PRIVATEKEY *EC_PRIVATEKEY_new(void); |
631 | void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a); | ||
632 | EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len); | ||
633 | int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out); | ||
634 | extern const ASN1_ITEM EC_PRIVATEKEY_it; | ||
624 | 635 | ||
625 | EC_PRIVATEKEY * | 636 | EC_PRIVATEKEY * |
626 | d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) | 637 | d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len) |