From d3f6d8aa023c54de8a140fc3586b8e318276e6b2 Mon Sep 17 00:00:00 2001 From: miod <> Date: Tue, 18 Nov 2014 05:27:05 +0000 Subject: Return success in param_copy_gost01() if there is no private key to copy; broken in r1.3. Spotted by Dmitry Eremin-Solenikov --- src/lib/libcrypto/gost/gostr341001_ameth.c | 4 ++-- src/lib/libssl/src/crypto/gost/gostr341001_ameth.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/lib/libcrypto/gost/gostr341001_ameth.c b/src/lib/libcrypto/gost/gostr341001_ameth.c index 243a7490fa..bf55190d5d 100644 --- a/src/lib/libcrypto/gost/gostr341001_ameth.c +++ b/src/lib/libcrypto/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 * 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, diff --git a/src/lib/libssl/src/crypto/gost/gostr341001_ameth.c b/src/lib/libssl/src/crypto/gost/gostr341001_ameth.c index 243a7490fa..bf55190d5d 100644 --- a/src/lib/libssl/src/crypto/gost/gostr341001_ameth.c +++ b/src/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 * 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, -- cgit v1.2.3-55-g6feb