diff options
| author | Ben Laurie <ben@openssl.org> | 2000-05-21 15:21:55 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2000-05-21 15:21:55 +0000 |
| commit | 4d29312ce198d00a69c4b0bf572c0de46778ecc9 (patch) | |
| tree | 4c2b8aa4124c570f50390fd7b2a87bd135e80236 | |
| parent | c129544f0f85f1bbf7ba65b816db1e899b413799 (diff) | |
| download | openssl-4d29312ce198d00a69c4b0bf572c0de46778ecc9.tar.gz | |
Yet more typesafety.
| -rw-r--r-- | crypto/evp/evp.h | 2 | ||||
| -rw-r--r-- | crypto/pkcs7/pk7_attr.c | 10 | ||||
| -rw-r--r-- | crypto/pkcs7/pkcs7.h | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 16e3719a45..c0f982afb1 100644 --- 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 edea2359b3..f22a708358 100644 --- 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 bc761a054f..f3f85f57af 100644 --- 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); |