summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-11-18 05:27:05 +0000
committermiod <miod@openbsd.org>2014-11-18 05:27:05 +0000
commitababa8c8e2e7fd04f1fe3ce50ee01d8e9d2afac5 (patch)
tree9313b2f564e6402d444a2aac2b83c63049207bff /lib/libssl/src
parentunifdef SETUIDSCRIPT and FDSCRIPT. we always use them. ok deraadt (diff)
downloadwireguard-openbsd-ababa8c8e2e7fd04f1fe3ce50ee01d8e9d2afac5.tar.xz
wireguard-openbsd-ababa8c8e2e7fd04f1fe3ce50ee01d8e9d2afac5.zip
Return success in param_copy_gost01() if there is no private key to copy;
broken in r1.3. Spotted by Dmitry Eremin-Solenikov
Diffstat (limited to 'lib/libssl/src')
-rw-r--r--lib/libssl/src/crypto/gost/gostr341001_ameth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/gost/gostr341001_ameth.c b/lib/libssl/src/crypto/gost/gostr341001_ameth.c
index 243a7490fab..bf55190d5d2 100644
--- a/lib/libssl/src/crypto/gost/gostr341001_ameth.c
+++ b/lib/libssl/src/crypto/gost/gostr341001_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_ameth.c,v 1.3 2014/11/13 20:29:55 miod Exp $ */
+/* $OpenBSD: gostr341001_ameth.c,v 1.4 2014/11/18 05:27:05 miod Exp $ */
/*
* Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
* Copyright (c) 2005-2006 Cryptocom LTD
@@ -593,7 +593,7 @@ param_copy_gost01(EVP_PKEY *to, const EVP_PKEY *from)
{
GOST_KEY *eto = to->pkey.gost;
const GOST_KEY *efrom = from->pkey.gost;
- int ret = 0;
+ int ret = 1;
if (EVP_PKEY_base_id(from) != EVP_PKEY_base_id(to)) {
GOSTerr(GOST_F_PARAM_COPY_GOST01,