From: Bodo Möller Date: Thu, 13 May 1999 15:27:45 +0000 (+0000) Subject: Some tiny clean-ups related to the cert_st / sess_cert_st change. X-Git-Tag: OpenSSL_0_9_3beta1~85 X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=224551f73222609952dcc0f21a6b007009c23d60 Some tiny clean-ups related to the cert_st / sess_cert_st change. --- diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 9a752c3d20..53b77797a5 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c @@ -139,14 +139,6 @@ CERT *ssl_cert_new(void) return(NULL); } memset(ret,0,sizeof(CERT)); -/* - ret->valid=0; - ret->mask=0; - ret->export_mask=0; - ret->cert_type=0; - ret->key->x509=NULL; - ret->key->publickey=NULL; - ret->key->privatekey=NULL; */ ret->key= &(ret->pkeys[SSL_PKEY_RSA_ENC]); ret->references=1; @@ -168,8 +160,6 @@ CERT *ssl_cert_dup(CERT *cert) memset(ret, 0, sizeof(CERT)); - ret->cert_type = cert->cert_type; - ret->key = &ret->pkeys[cert->key - &cert->pkeys[0]]; /* or ret->key = ret->pkeys + (cert->key - cert->pkeys), * if you find that more readable */ @@ -246,11 +236,6 @@ CERT *ssl_cert_dup(CERT *cert) } } - - /* ret->cert_chain should not exist: that's pure per-connection data. - * Anyway, we never use this function when it is non-NULL, - * so we just don't look at it. */ - /* ret->extra_certs *should* exist, but currently the own certificate * chain is held inside SSL_CTX */ diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index b063be276d..076129c8ea 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -252,8 +252,6 @@ typedef struct cert_pkey_st typedef struct cert_st { - int cert_type; - /* Current active set */ CERT_PKEY *key; /* ALWAYS points to an element of the pkeys array * Probably it would make more sense to store