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 @@
-/* $OpenBSD: ec_asn1.c,v 1.19 2015/10/16 15:09:28 jsing Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.20 2015/10/16 15:12:30 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -232,7 +232,8 @@ const ASN1_ITEM X9_62_PENTANOMIAL_it = {
         .sname = "X9_62_PENTANOMIAL",
 };
 
-DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_PENTANOMIAL)
+X9_62_PENTANOMIAL *X9_62_PENTANOMIAL_new(void);
+void X9_62_PENTANOMIAL_free(X9_62_PENTANOMIAL *a);
 
 X9_62_PENTANOMIAL *
 X9_62_PENTANOMIAL_new(void)
@@ -333,7 +334,8 @@ const ASN1_ITEM X9_62_CHARACTERISTIC_TWO_it = {
         .size = sizeof(X9_62_CHARACTERISTIC_TWO),
         .sname = "X9_62_CHARACTERISTIC_TWO",
 };
-DECLARE_ASN1_ALLOC_FUNCTIONS(X9_62_CHARACTERISTIC_TWO)
+X9_62_CHARACTERISTIC_TWO *X9_62_CHARACTERISTIC_TWO_new(void);
+void X9_62_CHARACTERISTIC_TWO_free(X9_62_CHARACTERISTIC_TWO *a);
 
 X9_62_CHARACTERISTIC_TWO *
 X9_62_CHARACTERISTIC_TWO_new(void)
@@ -504,7 +506,8 @@ const ASN1_ITEM ECPARAMETERS_it = {
         .size = sizeof(ECPARAMETERS),
         .sname = "ECPARAMETERS",
 };
-DECLARE_ASN1_ALLOC_FUNCTIONS(ECPARAMETERS)
+ECPARAMETERS *ECPARAMETERS_new(void);
+void ECPARAMETERS_free(ECPARAMETERS *a);
 
 ECPARAMETERS *
 ECPARAMETERS_new(void)
@@ -552,7 +555,11 @@ const ASN1_ITEM ECPKPARAMETERS_it = {
         .sname = "ECPKPARAMETERS",
 };
 
-DECLARE_ASN1_FUNCTIONS_const(ECPKPARAMETERS)
+ECPKPARAMETERS *ECPKPARAMETERS_new(void);
+void ECPKPARAMETERS_free(ECPKPARAMETERS *a);
+ECPKPARAMETERS *d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len);
+int i2d_ECPKPARAMETERS(const ECPKPARAMETERS *a, unsigned char **out);
+extern const ASN1_ITEM ECPKPARAMETERS_it;
 
 ECPKPARAMETERS *
 d2i_ECPKPARAMETERS(ECPKPARAMETERS **a, const unsigned char **in, long len)
@@ -620,7 +627,11 @@ const ASN1_ITEM EC_PRIVATEKEY_it = {
         .sname = "EC_PRIVATEKEY",
 };
 
-DECLARE_ASN1_FUNCTIONS_const(EC_PRIVATEKEY)
+EC_PRIVATEKEY *EC_PRIVATEKEY_new(void);
+void EC_PRIVATEKEY_free(EC_PRIVATEKEY *a);
+EC_PRIVATEKEY *d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len);
+int i2d_EC_PRIVATEKEY(const EC_PRIVATEKEY *a, unsigned char **out);
+extern const ASN1_ITEM EC_PRIVATEKEY_it;
 
 EC_PRIVATEKEY *
 d2i_EC_PRIVATEKEY(EC_PRIVATEKEY **a, const unsigned char **in, long len)