diff options
| author | jsing <> | 2014-12-10 15:36:47 +0000 |
|---|---|---|
| committer | jsing <> | 2014-12-10 15:36:47 +0000 |
| commit | 091bf547974906c9be5137a27f2db864521aaa69 (patch) | |
| tree | 8f2441ed940045edc4ad4d11ab3d8395f2830a78 /src/lib/libssl/t1_lib.c | |
| parent | 72ac14b2bd5b2397707e53cef778b9da5af1498f (diff) | |
| download | openbsd-091bf547974906c9be5137a27f2db864521aaa69.tar.gz openbsd-091bf547974906c9be5137a27f2db864521aaa69.tar.bz2 openbsd-091bf547974906c9be5137a27f2db864521aaa69.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 '')
| -rw-r--r-- | src/lib/libssl/t1_lib.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 5df45ab359..3b87d958cb 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: t1_lib.c,v 1.72 2014/12/10 14:58:56 jsing Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.73 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 | * |
| @@ -2448,7 +2448,6 @@ tls1_process_sigalgs(SSL *s, const unsigned char *data, int dsize) | |||
| 2448 | c->pkeys[SSL_PKEY_RSA_SIGN].digest = NULL; | 2448 | c->pkeys[SSL_PKEY_RSA_SIGN].digest = NULL; |
| 2449 | c->pkeys[SSL_PKEY_RSA_ENC].digest = NULL; | 2449 | c->pkeys[SSL_PKEY_RSA_ENC].digest = NULL; |
| 2450 | c->pkeys[SSL_PKEY_ECC].digest = NULL; | 2450 | c->pkeys[SSL_PKEY_ECC].digest = NULL; |
| 2451 | c->pkeys[SSL_PKEY_GOST94].digest = NULL; | ||
| 2452 | c->pkeys[SSL_PKEY_GOST01].digest = NULL; | 2451 | c->pkeys[SSL_PKEY_GOST01].digest = NULL; |
| 2453 | 2452 | ||
| 2454 | for (i = 0; i < dsize; i += 2) { | 2453 | for (i = 0; i < dsize; i += 2) { |
| @@ -2496,8 +2495,6 @@ tls1_process_sigalgs(SSL *s, const unsigned char *data, int dsize) | |||
| 2496 | if (!c->pkeys[SSL_PKEY_ECC].digest) | 2495 | if (!c->pkeys[SSL_PKEY_ECC].digest) |
| 2497 | c->pkeys[SSL_PKEY_ECC].digest = EVP_sha1(); | 2496 | c->pkeys[SSL_PKEY_ECC].digest = EVP_sha1(); |
| 2498 | #ifndef OPENSSL_NO_GOST | 2497 | #ifndef OPENSSL_NO_GOST |
| 2499 | if (!c->pkeys[SSL_PKEY_GOST94].digest) | ||
| 2500 | c->pkeys[SSL_PKEY_GOST94].digest = EVP_gostr341194(); | ||
| 2501 | if (!c->pkeys[SSL_PKEY_GOST01].digest) | 2498 | if (!c->pkeys[SSL_PKEY_GOST01].digest) |
| 2502 | c->pkeys[SSL_PKEY_GOST01].digest = EVP_gostr341194(); | 2499 | c->pkeys[SSL_PKEY_GOST01].digest = EVP_gostr341194(); |
| 2503 | #endif | 2500 | #endif |
