diff options
author | jsing <> | 2014-12-10 15:36:47 +0000 |
---|---|---|
committer | jsing <> | 2014-12-10 15:36:47 +0000 |
commit | 1434a91c4d4dc782915ce81dd056fa8f6cb77ae1 (patch) | |
tree | 8f2441ed940045edc4ad4d11ab3d8395f2830a78 /src/lib/libssl/s3_srvr.c | |
parent | 7b2f3298f7eb7ce5cfd1c3eb55b1ecc89118f52c (diff) | |
download | openbsd-1434a91c4d4dc782915ce81dd056fa8f6cb77ae1.tar.gz openbsd-1434a91c4d4dc782915ce81dd056fa8f6cb77ae1.tar.bz2 openbsd-1434a91c4d4dc782915ce81dd056fa8f6cb77ae1.zip |
Remove support for GOST R 34.10-94 signature authentication, along with
the two ciphersuites that use it. GOST94 public/private keys have been
long obsoleted and libcrypto does not have support for them anyway.
Discussed with Dmitry Eremin-Solenikov.
Diffstat (limited to 'src/lib/libssl/s3_srvr.c')
-rw-r--r-- | src/lib/libssl/s3_srvr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c index e1b2f9cf2d..43880a0610 100644 --- a/src/lib/libssl/s3_srvr.c +++ b/src/lib/libssl/s3_srvr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_srvr.c,v 1.91 2014/11/18 05:33:43 miod Exp $ */ | 1 | /* $OpenBSD: s3_srvr.c,v 1.92 2014/12/10 15:36:47 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -2134,9 +2134,7 @@ ssl3_get_client_key_exchange(SSL *s) | |||
2134 | 2134 | ||
2135 | /* Get our certificate private key*/ | 2135 | /* Get our certificate private key*/ |
2136 | alg_a = s->s3->tmp.new_cipher->algorithm_auth; | 2136 | alg_a = s->s3->tmp.new_cipher->algorithm_auth; |
2137 | if (alg_a & SSL_aGOST94) | 2137 | if (alg_a & SSL_aGOST01) |
2138 | pk = s->cert->pkeys[SSL_PKEY_GOST94].privatekey; | ||
2139 | else if (alg_a & SSL_aGOST01) | ||
2140 | pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey; | 2138 | pk = s->cert->pkeys[SSL_PKEY_GOST01].privatekey; |
2141 | 2139 | ||
2142 | pkey_ctx = EVP_PKEY_CTX_new(pk, NULL); | 2140 | pkey_ctx = EVP_PKEY_CTX_new(pk, NULL); |