diff options
| author | steve <steve> | 2000-12-06 18:33:56 +0000 |
|---|---|---|
| committer | steve <steve> | 2000-12-06 18:33:56 +0000 |
| commit | 99618e6ba26edf521fa79e77ab624f6d7f82038c (patch) | |
| tree | 6fe60302301e971d7bb918e81b9718b02011f108 /ssl/ssl_cert.c | |
| parent | f0c59ec71d7c5d3f8129bfff824d945f6c14cdd9 (diff) | |
| download | openssl-BRANCH_ASN1.tar.gz | |
Merge from main trunk: lets see if this works ;-)TOBEMERGED_ASN12mainBRANCH_ASN1
This involved the use of some temporary
macros which handle the partial constification.
They cast away const but this will go away when
constification is handled in the main ASN1 code.
Diffstat (limited to 'ssl/ssl_cert.c')
| -rw-r--r-- | ssl/ssl_cert.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index c26df62c2..130bb7906 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -131,6 +131,7 @@ int SSL_get_ex_data_X509_STORE_CTX_idx(void) { static int ssl_x509_store_ctx_idx= -1; + /* FIXME: should do locking */ if (ssl_x509_store_ctx_idx < 0) { ssl_x509_store_ctx_idx=X509_STORE_CTX_get_ex_new_index( @@ -271,7 +272,9 @@ CERT *ssl_cert_dup(CERT *cert) return(ret); +#ifndef NO_DH /* avoid 'unreferenced label' warning if NO_DH is defined */ err: +#endif #ifndef NO_RSA if (ret->rsa_tmp != NULL) RSA_free(ret->rsa_tmp); |