diff options
| author |   jsing <jsing@openbsd.org> | 2019-03-25 17:33:26 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2019-03-25 17:33:26 +0000 |
| commit | 890365848576c7e95472b62c3f667138bdfa2bc4 (patch) | |
| tree | deca27e456ac89c67e388e0a101c5b7fb477121c /lib/libssl/ssl_lib.c | |
| parent | tls1_process_sigalgs() is no longer needed. (diff) | |
| download | wireguard-openbsd-890365848576c7e95472b62c3f667138bdfa2bc4.tar.xz wireguard-openbsd-890365848576c7e95472b62c3f667138bdfa2bc4.zip | |
Strip out all of the pkey to sigalg and sigalg to pkey linkages.
These are no longer used now that we defer signature algorithm selection.
ok beck@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 70a4c6d16ff..adcaa1b3cca 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.203 2019/03/25 17:21:18 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.204 2019/03/25 17:33:26 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2734,20 +2734,14 @@ SSL_get_SSL_CTX(const SSL *ssl) SSL_CTX * SSL_set_SSL_CTX(SSL *ssl, SSL_CTX* ctx) { - CERT *ocert = ssl->cert; - if (ssl->ctx == ctx) return (ssl->ctx); if (ctx == NULL) ctx = ssl->initial_ctx; + + ssl_cert_free(ssl->cert); ssl->cert = ssl_cert_dup(ctx->internal->cert); - if (ocert != NULL) { - int i; - /* Copy negotiated sigalg from original certificate. */ - for (i = 0; i < SSL_PKEY_NUM; i++) - ssl->cert->pkeys[i].sigalg = ocert->pkeys[i].sigalg; - ssl_cert_free(ocert); - } + CRYPTO_add(&ctx->references, 1, CRYPTO_LOCK_SSL_CTX); SSL_CTX_free(ssl->ctx); /* decrement reference count */ ssl->ctx = ctx; |