OpenSSL 0.9.4 merge

1 files changed, 26 insertions, 25 deletions

diff --git a/src/lib/libcrypto/asn1/p7_signi.c b/src/lib/libcrypto/asn1/p7_signi.c
index 0da92169fc..21132ef4dd 100644
--- a/src/lib/libcrypto/asn1/p7_signi.c
+++ b/src/lib/libcrypto/asn1/p7_signi.c
@@ -58,45 +58,40 @@
 
 #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_SIGNER_INFO_NEW,ASN1_R_LENGTH_MISMATCH);
- * ASN1err(ASN1_F_D2I_PKCS7_SIGNER_INFO,ASN1_R_LENGTH_MISMATCH);
- */
-
-int i2d_PKCS7_SIGNER_INFO(a,pp)
-PKCS7_SIGNER_INFO *a;
-unsigned char **pp;
+int i2d_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO *a, unsigned char **pp)
         {
         M_ASN1_I2D_vars(a);
 
         M_ASN1_I2D_len(a->version,i2d_ASN1_INTEGER);
         M_ASN1_I2D_len(a->issuer_and_serial,i2d_PKCS7_ISSUER_AND_SERIAL);
         M_ASN1_I2D_len(a->digest_alg,i2d_X509_ALGOR);
-        M_ASN1_I2D_len_IMP_set_opt(a->auth_attr,i2d_X509_ATTRIBUTE,0);
+        M_ASN1_I2D_len_IMP_SET_opt_type(X509_ATTRIBUTE,a->auth_attr,
+                                        i2d_X509_ATTRIBUTE,0);
         M_ASN1_I2D_len(a->digest_enc_alg,i2d_X509_ALGOR);
         M_ASN1_I2D_len(a->enc_digest,i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_len_IMP_set_opt(a->unauth_attr,i2d_X509_ATTRIBUTE,1);
+        M_ASN1_I2D_len_IMP_SET_opt_type(X509_ATTRIBUTE,a->unauth_attr,
+                                        i2d_X509_ATTRIBUTE,1);
 
         M_ASN1_I2D_seq_total();
 
         M_ASN1_I2D_put(a->version,i2d_ASN1_INTEGER);
         M_ASN1_I2D_put(a->issuer_and_serial,i2d_PKCS7_ISSUER_AND_SERIAL);
         M_ASN1_I2D_put(a->digest_alg,i2d_X509_ALGOR);
-        M_ASN1_I2D_put_IMP_set_opt(a->auth_attr,i2d_X509_ATTRIBUTE,0);
+        M_ASN1_I2D_put_IMP_SET_opt_type(X509_ATTRIBUTE,a->auth_attr,
+                                        i2d_X509_ATTRIBUTE,0);
         M_ASN1_I2D_put(a->digest_enc_alg,i2d_X509_ALGOR);
         M_ASN1_I2D_put(a->enc_digest,i2d_ASN1_OCTET_STRING);
-        M_ASN1_I2D_put_IMP_set_opt(a->unauth_attr,i2d_X509_ATTRIBUTE,1);
+        M_ASN1_I2D_put_IMP_SET_opt_type(X509_ATTRIBUTE,a->unauth_attr,
+                                        i2d_X509_ATTRIBUTE,1);
 
         M_ASN1_I2D_finish();
         }
 
-PKCS7_SIGNER_INFO *d2i_PKCS7_SIGNER_INFO(a,pp,length)
-PKCS7_SIGNER_INFO **a;
-unsigned char **pp;
-long length;
+PKCS7_SIGNER_INFO *d2i_PKCS7_SIGNER_INFO(PKCS7_SIGNER_INFO **a,
+             unsigned char **pp, long length)
         {
         M_ASN1_D2I_vars(a,PKCS7_SIGNER_INFO *,PKCS7_SIGNER_INFO_new);
 
@@ -105,18 +100,23 @@ long length;
         M_ASN1_D2I_get(ret->version,d2i_ASN1_INTEGER);
         M_ASN1_D2I_get(ret->issuer_and_serial,d2i_PKCS7_ISSUER_AND_SERIAL);
         M_ASN1_D2I_get(ret->digest_alg,d2i_X509_ALGOR);
-        M_ASN1_D2I_get_IMP_set_opt(ret->auth_attr,d2i_X509_ATTRIBUTE,0);
+        M_ASN1_D2I_get_IMP_set_opt_type(X509_ATTRIBUTE,ret->auth_attr,
+                                        d2i_X509_ATTRIBUTE,X509_ATTRIBUTE_free,
+                                        0);
         M_ASN1_D2I_get(ret->digest_enc_alg,d2i_X509_ALGOR);
         M_ASN1_D2I_get(ret->enc_digest,d2i_ASN1_OCTET_STRING);
-        M_ASN1_D2I_get_IMP_set_opt(ret->unauth_attr,d2i_X509_ATTRIBUTE,1);
+        M_ASN1_D2I_get_IMP_set_opt_type(X509_ATTRIBUTE,ret->unauth_attr,
+                                        d2i_X509_ATTRIBUTE,
+                                        X509_ATTRIBUTE_free,1);
 
         M_ASN1_D2I_Finish(a,PKCS7_SIGNER_INFO_free,
                 ASN1_F_D2I_PKCS7_SIGNER_INFO);
         }
 
-PKCS7_SIGNER_INFO *PKCS7_SIGNER_INFO_new()
+PKCS7_SIGNER_INFO *PKCS7_SIGNER_INFO_new(void)
         {
         PKCS7_SIGNER_INFO *ret=NULL;
+        ASN1_CTX c;
 
         M_ASN1_New_Malloc(ret,PKCS7_SIGNER_INFO);
         M_ASN1_New(ret->version,ASN1_INTEGER_new);
@@ -131,19 +131,20 @@ PKCS7_SIGNER_INFO *PKCS7_SIGNER_INFO_new()
         M_ASN1_New_Error(ASN1_F_PKCS7_SIGNER_INFO_NEW);
         }
 
-void PKCS7_SIGNER_INFO_free(a)
-PKCS7_SIGNER_INFO *a;
+void PKCS7_SIGNER_INFO_free(PKCS7_SIGNER_INFO *a)
         {
         if (a == NULL) return;
         ASN1_INTEGER_free(a->version);
         PKCS7_ISSUER_AND_SERIAL_free(a->issuer_and_serial);
         X509_ALGOR_free(a->digest_alg);
-        sk_pop_free(a->auth_attr,X509_ATTRIBUTE_free);
+        sk_X509_ATTRIBUTE_pop_free(a->auth_attr,X509_ATTRIBUTE_free);
         X509_ALGOR_free(a->digest_enc_alg);
         ASN1_OCTET_STRING_free(a->enc_digest);
-        sk_pop_free(a->unauth_attr,X509_ATTRIBUTE_free);
+        sk_X509_ATTRIBUTE_pop_free(a->unauth_attr,X509_ATTRIBUTE_free);
         if (a->pkey != NULL)
                 EVP_PKEY_free(a->pkey);
         Free((char *)a);
         }
 
+IMPLEMENT_STACK_OF(PKCS7_SIGNER_INFO)
+IMPLEMENT_ASN1_SET_OF(PKCS7_SIGNER_INFO)