diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-05-09 21:22:45 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-05-09 21:22:45 +0000 |
| commit | 9d5cceac6fb0eca8945f630afff1a2288aa6332a (patch) | |
| tree | c3ba9334410f07e695dddfce321d85bc00e4139c /ssl/s2_clnt.c | |
| parent | ca8e5b9b8ad3c199943ad7850bf66bc03279c0b9 (diff) | |
| download | openssl-9d5cceac6fb0eca8945f630afff1a2288aa6332a.tar.gz | |
No actual change, but the cert_st member of struct ssl_session_st is now
called sess_cert instead of just cert. This is in preparation of further
changes: Probably often when s->session->sess_cert is used, we should
use s->cert instead; s->session->sess_cert should be a new structure
containing only the stuff that is for just one connection (e.g.
the peer's certificate, which the SSL client implementations currently
store in s->session->[sess_]cert, which is a very confusing thing to do).
Submitted by:
Reviewed by:
PR:
Diffstat (limited to 'ssl/s2_clnt.c')
| -rw-r--r-- | ssl/s2_clnt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 600d8c3c15..0f188ecaa4 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -437,7 +437,7 @@ static int get_server_hello(SSL *s) /* hmmm, can we have the problem of the other session with this * cert, Free's it before we increment the reference count. */ CRYPTO_w_lock(CRYPTO_LOCK_X509); - s->session->peer=s->session->cert->key->x509; + s->session->peer=s->session->sess_cert->key->x509; /* Shouldn't do this: already locked */ /*CRYPTO_add(&s->session->peer->references,1,CRYPTO_LOCK_X509);*/ s->session->peer->references++; @@ -570,7 +570,7 @@ static int client_master_key(SSL *s) memcpy(d,sess->master_key,(unsigned int)clear); d+=clear; - enc=ssl_rsa_public_encrypt(sess->cert,enc, + enc=ssl_rsa_public_encrypt(sess->sess_cert,enc, &(sess->master_key[clear]),d, (s->s2->ssl2_rollback)?RSA_SSLV23_PADDING:RSA_PKCS1_PADDING); if (enc <= 0) @@ -733,7 +733,7 @@ static int client_certificate(SSL *s) EVP_SignUpdate(&ctx,s->s2->key_material, (unsigned int)s->s2->key_material_length); EVP_SignUpdate(&ctx,cert_ch,(unsigned int)cert_ch_len); - n=i2d_X509(s->session->cert->key->x509,&p); + n=i2d_X509(s->session->sess_cert->key->x509,&p); EVP_SignUpdate(&ctx,buf,(unsigned int)n); p=buf; @@ -909,8 +909,8 @@ int ssl2_set_certificate(SSL *s, int type, int len, unsigned char *data) } /* cert for session */ - if (s->session->cert) ssl_cert_free(s->session->cert); - s->session->cert=c; + if (s->session->sess_cert) ssl_cert_free(s->session->sess_cert); + s->session->sess_cert=c; /* c->cert_type=type; */ |