From bb5ea36b962453c4d74dab15ac1897725a02707d Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 23 Feb 2001 03:16:09 +0000 Subject: Initial support for ASN1_ITEM_FUNCTION option to change the way ASN1 modules are exported. Still needs a bit of work for example the hack which a dummy function prototype to avoid compilers warning about multiple ;s. --- crypto/x509/x_all.c | 96 ++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'crypto/x509/x_all.c') diff --git a/crypto/x509/x_all.c b/crypto/x509/x_all.c index 65b785141d..3be4368c4f 100644 --- a/crypto/x509/x_all.c +++ b/crypto/x509/x_all.c @@ -67,195 +67,195 @@ int X509_verify(X509 *a, EVP_PKEY *r) { - return(ASN1_item_verify(&X509_CINF_it,a->sig_alg, + return(ASN1_item_verify(ASN1_ITEM_rptr(X509_CINF),a->sig_alg, a->signature,a->cert_info,r)); } int X509_REQ_verify(X509_REQ *a, EVP_PKEY *r) { - return( ASN1_item_verify(&X509_REQ_INFO_it, + return( ASN1_item_verify(ASN1_ITEM_rptr(X509_REQ_INFO), a->sig_alg,a->signature,a->req_info,r)); } int X509_CRL_verify(X509_CRL *a, EVP_PKEY *r) { - return(ASN1_item_verify(&X509_CRL_INFO_it, + return(ASN1_item_verify(ASN1_ITEM_rptr(X509_CRL_INFO), a->sig_alg, a->signature,a->crl,r)); } int NETSCAPE_SPKI_verify(NETSCAPE_SPKI *a, EVP_PKEY *r) { - return(ASN1_item_verify(&NETSCAPE_SPKAC_it, + return(ASN1_item_verify(ASN1_ITEM_rptr(NETSCAPE_SPKAC), a->sig_algor,a->signature,a->spkac,r)); } int X509_sign(X509 *x, EVP_PKEY *pkey, const EVP_MD *md) { - return(ASN1_item_sign(&X509_CINF_it, x->cert_info->signature, + return(ASN1_item_sign(ASN1_ITEM_rptr(X509_CINF), x->cert_info->signature, x->sig_alg, x->signature, x->cert_info,pkey,md)); } int X509_REQ_sign(X509_REQ *x, EVP_PKEY *pkey, const EVP_MD *md) { - return(ASN1_item_sign(&X509_REQ_INFO_it,x->sig_alg, NULL, + return(ASN1_item_sign(ASN1_ITEM_rptr(X509_REQ_INFO),x->sig_alg, NULL, x->signature, x->req_info,pkey,md)); } int X509_CRL_sign(X509_CRL *x, EVP_PKEY *pkey, const EVP_MD *md) { - return(ASN1_item_sign(&X509_CRL_INFO_it,x->crl->sig_alg, + return(ASN1_item_sign(ASN1_ITEM_rptr(X509_CRL_INFO),x->crl->sig_alg, x->sig_alg, x->signature, x->crl,pkey,md)); } int NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md) { - return(ASN1_item_sign(&NETSCAPE_SPKAC_it, x->sig_algor,NULL, + return(ASN1_item_sign(ASN1_ITEM_rptr(NETSCAPE_SPKAC), x->sig_algor,NULL, x->signature, x->spkac,pkey,md)); } X509_ATTRIBUTE *X509_ATTRIBUTE_dup(X509_ATTRIBUTE *xa) { - return ASN1_item_dup(&X509_ATTRIBUTE_it,xa); + return ASN1_item_dup(ASN1_ITEM_rptr(X509_ATTRIBUTE),xa); } X509 *X509_dup(X509 *x509) { - return ASN1_item_dup(&X509_it,x509); + return ASN1_item_dup(ASN1_ITEM_rptr(X509),x509); } X509_EXTENSION *X509_EXTENSION_dup(X509_EXTENSION *ex) { - return ASN1_item_dup(&X509_EXTENSION_it,ex); + return ASN1_item_dup(ASN1_ITEM_rptr(X509_EXTENSION),ex); } #ifndef OPENSSL_NO_FP_API X509 *d2i_X509_fp(FILE *fp, X509 **x509) { - return ASN1_item_d2i_fp(&X509_it, fp, x509); + return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509), fp, x509); } int i2d_X509_fp(FILE *fp, X509 *x509) { - return ASN1_item_i2d_fp(&X509_it, fp, x509); + return ASN1_item_i2d_fp(ASN1_ITEM_rptr(X509), fp, x509); } #endif X509 *d2i_X509_bio(BIO *bp, X509 **x509) { - return ASN1_item_d2i_bio(&X509_it, bp, x509); + return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509), bp, x509); } int i2d_X509_bio(BIO *bp, X509 *x509) { - return ASN1_item_i2d_bio(&X509_it, bp, x509); + return ASN1_item_i2d_bio(ASN1_ITEM_rptr(X509), bp, x509); } X509_CRL *X509_CRL_dup(X509_CRL *crl) { - return ASN1_item_dup(&X509_CRL_it, crl); + return ASN1_item_dup(ASN1_ITEM_rptr(X509_CRL), crl); } #ifndef OPENSSL_NO_FP_API X509_CRL *d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) { - return ASN1_item_d2i_fp(&X509_CRL_it, fp, crl); + return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl); } int i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl) { - return ASN1_item_i2d_fp(&X509_CRL_it, fp, crl); + return ASN1_item_i2d_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl); } #endif X509_CRL *d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) { - return ASN1_item_d2i_bio(&X509_CRL_it, bp, crl); + return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl); } int i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl) { - return ASN1_item_i2d_bio(&X509_CRL_it, bp, crl); + return ASN1_item_i2d_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl); } PKCS7 *PKCS7_dup(PKCS7 *p7) { - return ASN1_item_dup(&PKCS7_it, p7); + return ASN1_item_dup(ASN1_ITEM_rptr(PKCS7), p7); } #ifndef OPENSSL_NO_FP_API PKCS7 *d2i_PKCS7_fp(FILE *fp, PKCS7 **p7) { - return ASN1_item_d2i_fp(&PKCS7_it, fp, p7); + return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS7), fp, p7); } int i2d_PKCS7_fp(FILE *fp, PKCS7 *p7) { - return ASN1_item_i2d_fp(&PKCS7_it, fp, p7); + return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS7), fp, p7); } #endif PKCS7 *d2i_PKCS7_bio(BIO *bp, PKCS7 **p7) { - return ASN1_item_d2i_bio(&PKCS7_it, bp, p7); + return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS7), bp, p7); } int i2d_PKCS7_bio(BIO *bp, PKCS7 *p7) { - return ASN1_item_i2d_bio(&PKCS7_it, bp, p7); + return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS7), bp, p7); } X509_REQ *X509_REQ_dup(X509_REQ *req) { - return ASN1_item_dup(&X509_REQ_it, req); + return ASN1_item_dup(ASN1_ITEM_rptr(X509_REQ), req); } #ifndef OPENSSL_NO_FP_API X509_REQ *d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) { - return ASN1_item_d2i_fp(&X509_REQ_it, fp, req); + return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_REQ), fp, req); } int i2d_X509_REQ_fp(FILE *fp, X509_REQ *req) { - return ASN1_item_i2d_fp(&X509_REQ_it, fp, req); + return ASN1_item_i2d_fp(ASN1_ITEM_rptr(X509_REQ), fp, req); } #endif X509_REQ *d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) { - return ASN1_item_d2i_bio(&X509_REQ_it, bp, req); + return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_REQ), bp, req); } int i2d_X509_REQ_bio(BIO *bp, X509_REQ *req) { - return ASN1_item_i2d_bio(&X509_REQ_it, bp, req); + return ASN1_item_i2d_bio(ASN1_ITEM_rptr(X509_REQ), bp, req); } #ifndef OPENSSL_NO_RSA RSA *RSAPublicKey_dup(RSA *rsa) { - return ASN1_item_dup(&RSAPublicKey_it, rsa); + return ASN1_item_dup(ASN1_ITEM_rptr(RSAPublicKey), rsa); } RSA *RSAPrivateKey_dup(RSA *rsa) { - return ASN1_item_dup(&RSAPrivateKey_it, rsa); + return ASN1_item_dup(ASN1_ITEM_rptr(RSAPrivateKey), rsa); } #ifndef OPENSSL_NO_FP_API RSA *d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) { - return ASN1_item_d2i_fp(&RSAPrivateKey_it, fp, rsa); + return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); } int i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa) { - return ASN1_item_i2d_fp(&RSAPrivateKey_it, fp, rsa); + return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); } RSA *d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) { - return ASN1_item_d2i_fp(&RSAPublicKey_it, fp, rsa); + return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa); } @@ -268,7 +268,7 @@ RSA *d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa) int i2d_RSAPublicKey_fp(FILE *fp, RSA *rsa) { - return ASN1_item_i2d_fp(&RSAPublicKey_it, fp, rsa); + return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa); } int i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa) @@ -279,17 +279,17 @@ int i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa) RSA *d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa) { - return ASN1_item_d2i_bio(&RSAPrivateKey_it, bp, rsa); + return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); } int i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa) { - return ASN1_item_i2d_bio(&RSAPrivateKey_it, bp, rsa); + return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); } RSA *d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) { - return ASN1_item_d2i_bio(&RSAPublicKey_it, bp, rsa); + return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa); } @@ -302,7 +302,7 @@ RSA *d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa) int i2d_RSAPublicKey_bio(BIO *bp, RSA *rsa) { - return ASN1_item_i2d_bio(&RSAPublicKey_it, bp, rsa); + return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa); } int i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa) @@ -366,17 +366,17 @@ int i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa) X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn) { - return ASN1_item_dup(&X509_ALGOR_it, xn); + return ASN1_item_dup(ASN1_ITEM_rptr(X509_ALGOR), xn); } X509_NAME *X509_NAME_dup(X509_NAME *xn) { - return ASN1_item_dup(&X509_NAME_it, xn); + return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME), xn); } X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne) { - return ASN1_item_dup(&X509_NAME_ENTRY_it, ne); + return ASN1_item_dup(ASN1_ITEM_rptr(X509_NAME_ENTRY), ne); } int X509_pubkey_digest(const X509 *data, const EVP_MD *type, unsigned char *md, @@ -391,31 +391,31 @@ int X509_pubkey_digest(const X509 *data, const EVP_MD *type, unsigned char *md, int X509_digest(const X509 *data, const EVP_MD *type, unsigned char *md, unsigned int *len) { - return(ASN1_item_digest(&X509_it,type,(char *)data,md,len)); + return(ASN1_item_digest(ASN1_ITEM_rptr(X509),type,(char *)data,md,len)); } int X509_CRL_digest(const X509_CRL *data, const EVP_MD *type, unsigned char *md, unsigned int *len) { - return(ASN1_item_digest(&X509_CRL_it,type,(char *)data,md,len)); + return(ASN1_item_digest(ASN1_ITEM_rptr(X509_CRL),type,(char *)data,md,len)); } int X509_REQ_digest(const X509_REQ *data, const EVP_MD *type, unsigned char *md, unsigned int *len) { - return(ASN1_item_digest(&X509_REQ_it,type,(char *)data,md,len)); + return(ASN1_item_digest(ASN1_ITEM_rptr(X509_REQ),type,(char *)data,md,len)); } int X509_NAME_digest(const X509_NAME *data, const EVP_MD *type, unsigned char *md, unsigned int *len) { - return(ASN1_item_digest(&X509_NAME_it,type,(char *)data,md,len)); + return(ASN1_item_digest(ASN1_ITEM_rptr(X509_NAME),type,(char *)data,md,len)); } int PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data, const EVP_MD *type, unsigned char *md, unsigned int *len) { - return(ASN1_item_digest(&PKCS7_ISSUER_AND_SERIAL_it,type, + return(ASN1_item_digest(ASN1_ITEM_rptr(PKCS7_ISSUER_AND_SERIAL),type, (char *)data,md,len)); } -- cgit v1.2.3