nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix our tls handshake chain cert bug

Browse Source 
svn:r2086
This commit is contained in:
Roger Dingledine 2004-07-21 22:11:11 +00:00
parent ce7fcd110c
commit cdb98cf04a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/tortls.c
View File

@ -277,8 +277,8 @@ tor_tls_create_certificate(crypto_pk_env_t *rsa,
* should be NULL. Return -1 if failure, else 0. * should be NULL. Return -1 if failure, else 0.
* *
* You can call this function multiple times. Each time you call it, * You can call this function multiple times. Each time you call it,
* it generates new certificates; all new connections will be begin * it generates new certificates; all new connections will use
* with the new SSL context. * the new SSL context.
*/ */
int int
tor_tls_context_new(crypto_pk_env_t *identity, tor_tls_context_new(crypto_pk_env_t *identity,
@ -652,6 +652,7 @@ tor_tls_verify(tor_tls *tls, crypto_pk_env_t **identity_key)
STACK_OF(X509) *chain = NULL; STACK_OF(X509) *chain = NULL;
EVP_PKEY *id_pkey = NULL; EVP_PKEY *id_pkey = NULL;
RSA *rsa; RSA *rsa;
int num_in_chain;
time_t now, t; time_t now, t;
int r = -1, i; int r = -1, i;
@ -661,12 +662,18 @@ tor_tls_verify(tor_tls *tls, crypto_pk_env_t **identity_key)
goto done; goto done;
if (!(chain = SSL_get_peer_cert_chain(tls->ssl))) if (!(chain = SSL_get_peer_cert_chain(tls->ssl)))
goto done; goto done;
if (sk_X509_num(chain) != 2) { num_in_chain = sk_X509_num(chain);
log_fn(LOG_DEBUG,"Number of certs in chain: %d", num_in_chain);
/* 1 means we're receiving (server-side), and it's just the id_cert.
* 2 means we're connecting (client-side), and it's both the link
* cert and the id_cert.
*/
if (num_in_chain < 1) {
log_fn(LOG_WARN,"Unexpected number of certificates in chain (%d)", log_fn(LOG_WARN,"Unexpected number of certificates in chain (%d)",
sk_X509_num(chain)); num_in_chain);
goto done; goto done;
} }
for (i=0; i<2; ++i) { for (i=0; i<num_in_chain; ++i) {
id_cert = sk_X509_value(chain, i); id_cert = sk_X509_value(chain, i);
if (X509_cmp(id_cert, cert) != 0) if (X509_cmp(id_cert, cert) != 0)
break; break;