Yet more typesafety.

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 16e3719a458975cb990140df248395ccd5a0aeb4..c0f982afb1c952a975b61c89557740811d824bc9 100644 (file)
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -176,7 +176,7 @@ typedef struct evp_pkey_st
 #endif
                } pkey;
        int save_parameters;
-       STACK /*X509_ATTRIBUTE*/ *attributes; /* [ 0 ] */
+       STACK_OF(X509_ATTRIBUTE) *attributes; /* [ 0 ] */
        } EVP_PKEY;
 
 #define EVP_PKEY_MO_SIGN       0x0001

diff --git a/crypto/pkcs7/pk7_attr.c b/crypto/pkcs7/pk7_attr.c
index edea2359b3db6c9ee24d4e08b94f2214e768756c..f22a708358d38c17b97d62654d3d946217f44071 100644 (file)
--- a/crypto/pkcs7/pk7_attr.c
+++ b/crypto/pkcs7/pk7_attr.c
@@ -12,6 +12,7 @@
 #include <openssl/asn1.h>
 #include <openssl/pem.h>
 #include <openssl/pkcs7.h>
+#include <openssl/x509.h>
 #include <openssl/err.h>
 
 int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap)
@@ -42,16 +43,17 @@ int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap)
                                                        V_ASN1_SEQUENCE, seq);
 }
 
-STACK *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si)
+STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si)
 {
        ASN1_TYPE *cap;
        unsigned char *p;
        cap = PKCS7_get_signed_attribute(si, NID_SMIMECapabilities);
        if (!cap) return NULL;
        p = cap->value.sequence->data;
-       return d2i_ASN1_SET (NULL, &p, cap->value.sequence->length, 
-               (char *(*)())d2i_X509_ALGOR, X509_ALGOR_free, V_ASN1_SEQUENCE,
-                                                        V_ASN1_UNIVERSAL);
+       return d2i_ASN1_SET_OF_X509_ALGOR(NULL, &p,
+                                         cap->value.sequence->length,
+                                         d2i_X509_ALGOR, X509_ALGOR_free,
+                                         V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
 }
 
 /* Basic smime-capabilities OID and optional integer arg */

diff --git a/crypto/pkcs7/pkcs7.h b/crypto/pkcs7/pkcs7.h
index bc761a054f8ce78bdf7dfcceac351451ebfa3d35..f3f85f57afb3c89beb182b812578654ffaa6dac1 100644 (file)
--- a/crypto/pkcs7/pkcs7.h
+++ b/crypto/pkcs7/pkcs7.h
@@ -408,7 +408,7 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags);
 
 int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si,
                              STACK_OF(X509_ALGOR) *cap);
-STACK *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si);
+STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si);
 int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg);
 
 int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);