1 files changed, 11 insertions, 18 deletions

diff --git a/src/lib/libcrypto/asn1/p7_recip.c b/src/lib/libcrypto/asn1/p7_recip.c
index f02233f5a8..9fda4f20d4 100644
--- a/src/lib/libcrypto/asn1/p7_recip.c
+++ b/src/lib/libcrypto/asn1/p7_recip.c
@@ -58,17 +58,10 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "asn1_mac.h"
-#include "x509.h"
+#include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
-/*
- * ASN1err(ASN1_F_PKCS7_RECIP_INFO_NEW,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_D2I_PKCS7_RECIP_INFO,ASN1_R_LENGTH_MISMATCH);
- */
-
-int i2d_PKCS7_RECIP_INFO(a,pp)
-PKCS7_RECIP_INFO *a;
-unsigned char **pp;
+int i2d_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO *a, unsigned char **pp)
         {
         M_ASN1_I2D_vars(a);
 
@@ -87,10 +80,8 @@ unsigned char **pp;
         M_ASN1_I2D_finish();
         }
 
-PKCS7_RECIP_INFO *d2i_PKCS7_RECIP_INFO(a,pp,length)
-PKCS7_RECIP_INFO **a;
-unsigned char **pp;
-long length;
+PKCS7_RECIP_INFO *d2i_PKCS7_RECIP_INFO(PKCS7_RECIP_INFO **a,
+             unsigned char **pp, long length)
         {
         M_ASN1_D2I_vars(a,PKCS7_RECIP_INFO *,PKCS7_RECIP_INFO_new);
 
@@ -104,9 +95,10 @@ long length;
         M_ASN1_D2I_Finish(a,PKCS7_RECIP_INFO_free,ASN1_F_D2I_PKCS7_RECIP_INFO);
         }
 
-PKCS7_RECIP_INFO *PKCS7_RECIP_INFO_new()
+PKCS7_RECIP_INFO *PKCS7_RECIP_INFO_new(void)
         {
         PKCS7_RECIP_INFO *ret=NULL;
+        ASN1_CTX c;
 
         M_ASN1_New_Malloc(ret,PKCS7_RECIP_INFO);
         M_ASN1_New(ret->version,ASN1_INTEGER_new);
@@ -118,8 +110,7 @@ PKCS7_RECIP_INFO *PKCS7_RECIP_INFO_new()
         M_ASN1_New_Error(ASN1_F_PKCS7_RECIP_INFO_NEW);
         }
 
-void PKCS7_RECIP_INFO_free(a)
-PKCS7_RECIP_INFO *a;
+void PKCS7_RECIP_INFO_free(PKCS7_RECIP_INFO *a)
         {
         if (a == NULL) return;
         ASN1_INTEGER_free(a->version);
@@ -127,6 +118,8 @@ PKCS7_RECIP_INFO *a;
         X509_ALGOR_free(a->key_enc_algor);
         ASN1_OCTET_STRING_free(a->enc_key);
         if (a->cert != NULL) X509_free(a->cert);
-        Free((char *)a);
+        Free(a);
         }
 
+IMPLEMENT_STACK_OF(PKCS7_RECIP_INFO)
+IMPLEMENT_ASN1_SET_OF(PKCS7_RECIP_INFO)