diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-01-23 23:41:49 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-01-23 23:41:49 +0000 |
| commit | dd9d233e2aa493fa1398b527afbf6aa5cdb23f23 (patch) | |
| tree | 7606ef123dde3077e09da458c3a41b1a02dda46e /crypto/asn1/x_x509.c | |
| parent | dd8dec69b825c9fdafc26a200961702d850496b5 (diff) | |
| download | openssl-dd9d233e2aa493fa1398b527afbf6aa5cdb23f23.tar.gz | |
Tidy up CRYPTO_EX_DATA structures.
Diffstat (limited to 'crypto/asn1/x_x509.c')
| -rw-r--r-- | crypto/asn1/x_x509.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crypto/asn1/x_x509.c b/crypto/asn1/x_x509.c index ee3213045e..ee74bc9a2d 100644 --- a/crypto/asn1/x_x509.c +++ b/crypto/asn1/x_x509.c @@ -63,7 +63,7 @@ #include <openssl/x509.h> static int x509_meth_num = 0; -static STACK *x509_meth = NULL; +static STACK_OF(CRYPTO_EX_DATA_FUNCS) *x509_meth = NULL; static ASN1_METHOD meth={ (int (*)()) i2d_X509, @@ -122,7 +122,7 @@ X509 *X509_new(void) M_ASN1_New(ret->cert_info,X509_CINF_new); M_ASN1_New(ret->sig_alg,X509_ALGOR_new); M_ASN1_New(ret->signature,M_ASN1_BIT_STRING_new); - CRYPTO_new_ex_data(x509_meth, (char *)ret, &ret->ex_data); + CRYPTO_new_ex_data(x509_meth, ret, &ret->ex_data); return(ret); M_ASN1_New_Error(ASN1_F_X509_NEW); } @@ -146,7 +146,7 @@ void X509_free(X509 *a) } #endif - CRYPTO_free_ex_data(x509_meth,(char *)a,&a->ex_data); + CRYPTO_free_ex_data(x509_meth,a,&a->ex_data); X509_CINF_free(a->cert_info); X509_ALGOR_free(a->sig_alg); M_ASN1_BIT_STRING_free(a->signature); @@ -156,20 +156,20 @@ void X509_free(X509 *a) Free((char *)a); } -int X509_get_ex_new_index(long argl, char *argp, int (*new_func)(), - int (*dup_func)(), void (*free_func)()) +int X509_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, + CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) { x509_meth_num++; return(CRYPTO_get_ex_new_index(x509_meth_num-1, &x509_meth,argl,argp,new_func,dup_func,free_func)); } -int X509_set_ex_data(X509 *r, int idx, char *arg) +int X509_set_ex_data(X509 *r, int idx, void *arg) { return(CRYPTO_set_ex_data(&r->ex_data,idx,arg)); } -char *X509_get_ex_data(X509 *r, int idx) +void *X509_get_ex_data(X509 *r, int idx) { return(CRYPTO_get_ex_data(&r->ex_data,idx)); } |