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/s3_lib.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/s3_lib.c')
| -rw-r--r-- | lib/libssl/s3_lib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/libssl/s3_lib.c b/lib/libssl/s3_lib.c index 8d03512a264..d8b923afd4a 100644 --- a/lib/libssl/s3_lib.c +++ b/lib/libssl/s3_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_lib.c,v 1.79 2014/08/24 14:36:45 jsing Exp $ */ +/* $OpenBSD: s3_lib.c,v 1.80 2014/09/07 12:16:23 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -2610,12 +2610,11 @@ ssl3_get_req_cert_type(SSL *s, unsigned char *p) } #endif - if (alg_k & (SSL_kDHr|SSL_kDHE)) { + if (alg_k & SSL_kDHE) { p[ret++] = SSL3_CT_RSA_FIXED_DH; p[ret++] = SSL3_CT_DSS_FIXED_DH; } - if ((s->version == SSL3_VERSION) && - (alg_k & (SSL_kDHE|SSL_kDHd|SSL_kDHr))) { + if (s->version == SSL3_VERSION && (alg_k & SSL_kDHE)) { p[ret++] = SSL3_CT_RSA_EPHEMERAL_DH; p[ret++] = SSL3_CT_DSS_EPHEMERAL_DH; } |