summaryrefslogtreecommitdiffstats
path: root/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-11-18 05:33:43 +0000
committermiod <miod@openbsd.org>2014-11-18 05:33:43 +0000
commit4bb6f241c5c21adcaeba90e28dbb74fe4ebc8304 (patch)
tree4d37beb3d2303feabd53aefe9ce9796063158d54 /lib/libssl/ssl_cert.c
parentEnable the build of GOST routines in libcrypto. Riding upon the Cammelia (diff)
downloadwireguard-openbsd-4bb6f241c5c21adcaeba90e28dbb74fe4ebc8304.tar.xz
wireguard-openbsd-4bb6f241c5c21adcaeba90e28dbb74fe4ebc8304.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 'lib/libssl/ssl_cert.c')
-rw-r--r--lib/libssl/ssl_cert.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libssl/ssl_cert.c b/lib/libssl/ssl_cert.c
index 7938c82c946..8bbfcd85d15 100644
--- a/lib/libssl/ssl_cert.c
+++ b/lib/libssl/ssl_cert.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_cert.c,v 1.45 2014/11/16 14:12:47 jsing Exp $ */
+/* $OpenBSD: ssl_cert.c,v 1.46 2014/11/18 05:33:43 miod Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -166,6 +166,10 @@ ssl_cert_set_default_md(CERT *cert)
cert->pkeys[SSL_PKEY_RSA_SIGN].digest = EVP_sha1();
cert->pkeys[SSL_PKEY_RSA_ENC].digest = EVP_sha1();
cert->pkeys[SSL_PKEY_ECC].digest = EVP_sha1();
+#ifndef OPENSSL_NO_GOST
+ cert->pkeys[SSL_PKEY_GOST94].digest = EVP_gostr341194();
+ cert->pkeys[SSL_PKEY_GOST01].digest = EVP_gostr341194();
+#endif
}
CERT *