summaryrefslogtreecommitdiffstats
path: root/lib/libcrypto/evp/pmeth_lib.c
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-11-09 19:17:11 +0000
committermiod <miod@openbsd.org>2014-11-09 19:17:11 +0000
commit90f161cce41168eb31d5c3c6bb6769d367068d3b (patch)
tree13d4856397bfe17cb51b725e43d3eb5b85d0737e /lib/libcrypto/evp/pmeth_lib.c
parentIntroduce EVP_MD_CTX_ctrl(), to allow for fine control of a given digest. (diff)
downloadwireguard-openbsd-90f161cce41168eb31d5c3c6bb6769d367068d3b.tar.xz
wireguard-openbsd-90f161cce41168eb31d5c3c6bb6769d367068d3b.zip
GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov; libcrypto bits only for now. This is a verbatim import of Dmitry's work, and does not compile in this state; the forthcoming commits will address these issues. None of the GOST code is enabled in libcrypto yet, for it still gets compiled with OPENSSL_NO_GOST defined. However, the public header gost.h will be installed.
Diffstat (limited to 'lib/libcrypto/evp/pmeth_lib.c')
-rw-r--r--lib/libcrypto/evp/pmeth_lib.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/libcrypto/evp/pmeth_lib.c b/lib/libcrypto/evp/pmeth_lib.c
index 12267a6d933..24cdfdd1d0c 100644
--- a/lib/libcrypto/evp/pmeth_lib.c
+++ b/lib/libcrypto/evp/pmeth_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmeth_lib.c,v 1.9 2014/07/12 16:03:37 miod Exp $ */
+/* $OpenBSD: pmeth_lib.c,v 1.10 2014/11/09 19:17:13 miod Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@@ -79,6 +79,7 @@ STACK_OF(EVP_PKEY_METHOD) *app_pkey_methods = NULL;
extern const EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth;
extern const EVP_PKEY_METHOD ec_pkey_meth, hmac_pkey_meth, cmac_pkey_meth;
+extern const EVP_PKEY_METHOD gostimit_pkey_meth, gostr01_pkey_meth;
static const EVP_PKEY_METHOD *standard_methods[] = {
#ifndef OPENSSL_NO_RSA
@@ -93,8 +94,12 @@ static const EVP_PKEY_METHOD *standard_methods[] = {
#ifndef OPENSSL_NO_EC
&ec_pkey_meth,
#endif
+#ifndef OPENSSL_NO_GOST
+ &gostr01_pkey_meth,
+ &gostimit_pkey_meth,
+#endif
&hmac_pkey_meth,
- &cmac_pkey_meth
+ &cmac_pkey_meth,
};
DECLARE_OBJ_BSEARCH_CMP_FN(const EVP_PKEY_METHOD *, const EVP_PKEY_METHOD *,