Expand DECLARE_ASN1_.*FUNCTIONS macros.

No change in preprocessed output, ignoring whitespace and line numbers.

2 files changed, 27 insertions, 7 deletions

diff --git a/src/lib/libcrypto/gost/gost.h b/src/lib/libcrypto/gost/gost.h
index 516c1b41fc..092f96fb60 100644
--- a/src/lib/libcrypto/gost/gost.h
+++ b/src/lib/libcrypto/gost/gost.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gost.h,v 1.2 2014/11/09 19:24:30 miod Exp $ */
+/* $OpenBSD: gost.h,v 1.3 2016/09/04 17:02:31 jsing Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -89,7 +89,11 @@ typedef struct {
         ASN1_OBJECT *enc_param_set;
 } GOST_CIPHER_PARAMS;
 
-DECLARE_ASN1_FUNCTIONS(GOST_CIPHER_PARAMS)
+GOST_CIPHER_PARAMS *GOST_CIPHER_PARAMS_new(void);
+void GOST_CIPHER_PARAMS_free(GOST_CIPHER_PARAMS *a);
+GOST_CIPHER_PARAMS *d2i_GOST_CIPHER_PARAMS(GOST_CIPHER_PARAMS **a, const unsigned char **in, long len);
+int i2d_GOST_CIPHER_PARAMS(GOST_CIPHER_PARAMS *a, unsigned char **out);
+extern const ASN1_ITEM GOST_CIPHER_PARAMS_it;
 
 #define GOST2814789IMIT_LENGTH 4
 #define GOST2814789IMIT_CBLOCK 8
diff --git a/src/lib/libcrypto/gost/gost_asn1.h b/src/lib/libcrypto/gost/gost_asn1.h
index 62719c70cd..8cafa6be3b 100644
--- a/src/lib/libcrypto/gost/gost_asn1.h
+++ b/src/lib/libcrypto/gost/gost_asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gost_asn1.h,v 1.1 2014/11/09 19:17:13 miod Exp $ */
+/* $OpenBSD: gost_asn1.h,v 1.2 2016/09/04 17:02:31 jsing Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -59,7 +59,11 @@ typedef struct {
         ASN1_OCTET_STRING *imit;
 } GOST_KEY_INFO;
 
-DECLARE_ASN1_FUNCTIONS(GOST_KEY_INFO)
+GOST_KEY_INFO *GOST_KEY_INFO_new(void);
+void GOST_KEY_INFO_free(GOST_KEY_INFO *a);
+GOST_KEY_INFO *d2i_GOST_KEY_INFO(GOST_KEY_INFO **a, const unsigned char **in, long len);
+int i2d_GOST_KEY_INFO(GOST_KEY_INFO *a, unsigned char **out);
+extern const ASN1_ITEM GOST_KEY_INFO_it;
 
 typedef struct {
         ASN1_OBJECT *cipher;
@@ -67,14 +71,22 @@ typedef struct {
         ASN1_OCTET_STRING *eph_iv;
 } GOST_KEY_AGREEMENT_INFO;
 
-DECLARE_ASN1_FUNCTIONS(GOST_KEY_AGREEMENT_INFO)
+GOST_KEY_AGREEMENT_INFO *GOST_KEY_AGREEMENT_INFO_new(void);
+void GOST_KEY_AGREEMENT_INFO_free(GOST_KEY_AGREEMENT_INFO *a);
+GOST_KEY_AGREEMENT_INFO *d2i_GOST_KEY_AGREEMENT_INFO(GOST_KEY_AGREEMENT_INFO **a, const unsigned char **in, long len);
+int i2d_GOST_KEY_AGREEMENT_INFO(GOST_KEY_AGREEMENT_INFO *a, unsigned char **out);
+extern const ASN1_ITEM GOST_KEY_AGREEMENT_INFO_it;
 
 typedef struct {
         GOST_KEY_INFO *key_info;
         GOST_KEY_AGREEMENT_INFO *key_agreement_info;
 } GOST_KEY_TRANSPORT;
 
-DECLARE_ASN1_FUNCTIONS(GOST_KEY_TRANSPORT)
+GOST_KEY_TRANSPORT *GOST_KEY_TRANSPORT_new(void);
+void GOST_KEY_TRANSPORT_free(GOST_KEY_TRANSPORT *a);
+GOST_KEY_TRANSPORT *d2i_GOST_KEY_TRANSPORT(GOST_KEY_TRANSPORT **a, const unsigned char **in, long len);
+int i2d_GOST_KEY_TRANSPORT(GOST_KEY_TRANSPORT *a, unsigned char **out);
+extern const ASN1_ITEM GOST_KEY_TRANSPORT_it;
 
 typedef struct {
         ASN1_OBJECT *key_params;
@@ -82,6 +94,10 @@ typedef struct {
         ASN1_OBJECT *cipher_params;
 } GOST_KEY_PARAMS;
 
-DECLARE_ASN1_FUNCTIONS(GOST_KEY_PARAMS)
+GOST_KEY_PARAMS *GOST_KEY_PARAMS_new(void);
+void GOST_KEY_PARAMS_free(GOST_KEY_PARAMS *a);
+GOST_KEY_PARAMS *d2i_GOST_KEY_PARAMS(GOST_KEY_PARAMS **a, const unsigned char **in, long len);
+int i2d_GOST_KEY_PARAMS(GOST_KEY_PARAMS *a, unsigned char **out);
+extern const ASN1_ITEM GOST_KEY_PARAMS_it;
 
 #endif