diff options
author | miod <> | 2014-11-18 05:33:43 +0000 |
---|---|---|
committer | miod <> | 2014-11-18 05:33:43 +0000 |
commit | 262abb9ff4e2d2ca7a3d97ba9509d716fe37985d (patch) | |
tree | 1ff6097d67d8f3a7af1e40761e736566bcd71b7d /src/lib/libssl/ssl_cert.c | |
parent | 0690f68b8ace3f1616822e1b9dbf5656beaaea16 (diff) | |
download | openbsd-262abb9ff4e2d2ca7a3d97ba9509d716fe37985d.tar.gz openbsd-262abb9ff4e2d2ca7a3d97ba9509d716fe37985d.tar.bz2 openbsd-262abb9ff4e2d2ca7a3d97ba9509d716fe37985d.zip |
Update the GOST code in libssl, as contributed by Dmitry Eremin-Solenikov.
This causes a libssl major version bump as this affects the layout of some
internal-but-unfortunately-made-visible structs.
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r-- | src/lib/libssl/ssl_cert.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index 7938c82c94..8bbfcd85d1 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_cert.c,v 1.45 2014/11/16 14:12:47 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.46 2014/11/18 05:33:43 miod 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 | * |
@@ -166,6 +166,10 @@ ssl_cert_set_default_md(CERT *cert) | |||
166 | cert->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1(); | 166 | cert->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1(); |
167 | cert->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1(); | 167 | cert->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1(); |
168 | cert->pkeys[SSL_PKEY_ECC].digest = EVP_sha1(); | 168 | cert->pkeys[SSL_PKEY_ECC].digest = EVP_sha1(); |
169 | #ifndef OPENSSL_NO_GOST | ||
170 | cert->pkeys[SSL_PKEY_GOST94].digest = EVP_gostr341194(); | ||
171 | cert->pkeys[SSL_PKEY_GOST01].digest = EVP_gostr341194(); | ||
172 | #endif | ||
169 | } | 173 | } |
170 | 174 | ||
171 | CERT * | 175 | CERT * |