More extension code. Incomplete support for subject and issuer alt

[openssl.git] / crypto / asn1 / p7_recip.c

diff --git a/crypto/asn1/p7_recip.c b/crypto/asn1/p7_recip.c
index e4ebda0060523e79e46d5928acfc16b7b2e1d290..2516d7b193e1f22f388b4e6359496a9d14d8d430 100644 (file)
--- a/crypto/asn1/p7_recip.c
+++ b/crypto/asn1/p7_recip.c
@@ -1,5 +1,5 @@
 /* crypto/asn1/p7_recip.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -62,8 +62,8 @@
 #include "x509.h"
 
 /*
- * ASN1err(ASN1_F_PKCS7_RECIP_INFO_NEW,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_D2I_PKCS7_RECIP_INFO,ASN1_R_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_PKCS7_RECIP_INFO_NEW,ERR_R_ASN1_LENGTH_MISMATCH);
+ * ASN1err(ASN1_F_D2I_PKCS7_RECIP_INFO,ERR_R_ASN1_LENGTH_MISMATCH);
  */
 
 int i2d_PKCS7_RECIP_INFO(a,pp)
@@ -107,12 +107,14 @@ long length;
 PKCS7_RECIP_INFO *PKCS7_RECIP_INFO_new()
        {
        PKCS7_RECIP_INFO *ret=NULL;
+       ASN1_CTX c;
 
        M_ASN1_New_Malloc(ret,PKCS7_RECIP_INFO);
        M_ASN1_New(ret->version,ASN1_INTEGER_new);
        M_ASN1_New(ret->issuer_and_serial,PKCS7_ISSUER_AND_SERIAL_new);
        M_ASN1_New(ret->key_enc_algor,X509_ALGOR_new);
        M_ASN1_New(ret->enc_key,ASN1_OCTET_STRING_new);
+       ret->cert=NULL;
        return(ret);
        M_ASN1_New_Error(ASN1_F_PKCS7_RECIP_INFO_NEW);
        }
@@ -125,6 +127,7 @@ PKCS7_RECIP_INFO *a;
        PKCS7_ISSUER_AND_SERIAL_free(a->issuer_and_serial);
        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);
        }