diff options
| author |   jsing <jsing@openbsd.org> | 2014-09-07 12:16:23 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-09-07 12:16:23 +0000 |
| commit | c54199ea7f78973831ef8ea53a919d43d79e0213 (patch) | |
| tree | 57f0436d55b313c4f2356acf04e88c463e81fb24 /lib/libssl/src/ssl/d1_srvr.c | |
| parent | Remove last use of xargs(1). (diff) | |
| download | wireguard-openbsd-c54199ea7f78973831ef8ea53a919d43d79e0213.tar.xz wireguard-openbsd-c54199ea7f78973831ef8ea53a919d43d79e0213.zip | |
Remove SSL_kDHr, SSL_kDHd and SSL_aDH. No supported ciphersuites use them,
nor do we plan on supporting them.
ok guenther@
Diffstat (limited to 'lib/libssl/src/ssl/d1_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/d1_srvr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/libssl/src/ssl/d1_srvr.c b/lib/libssl/src/ssl/d1_srvr.c index 4532a07da5c..051d1e1ccf6 100644 --- a/lib/libssl/src/ssl/d1_srvr.c +++ b/lib/libssl/src/ssl/d1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srvr.c,v 1.37 2014/08/24 14:36:45 jsing Exp $ */ +/* $OpenBSD: d1_srvr.c,v 1.38 2014/09/07 12:16:23 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -462,8 +462,7 @@ dtls1_accept(SSL *s) /* only send if a DH key exchange or * RSA but we have a sign only certificate */ if (s->s3->tmp.use_rsa_tmp - || (alg_k & (SSL_kDHE|SSL_kDHr|SSL_kDHd)) - || (alg_k & SSL_kECDHE) + || (alg_k & (SSL_kDHE|SSL_kECDHE)) || ((alg_k & SSL_kRSA) && (s->cert->pkeys[SSL_PKEY_RSA_ENC].privatekey == NULL ) |