From 5a27d0fd33187fa17d3aa1b151b981a5434a200f Mon Sep 17 00:00:00 2001
From: jsg <>
Date: Sun, 15 Jul 2018 05:38:48 +0000
Subject: back out ecc constant time changes

after the constant time commits various regress tests started failing
on sparc64 ssh t9, libcrypto ec ecdh ecdsa and trying to ssh out
resulted in 'invalid elliptic curve value'

ok tb@
---
 src/lib/libcrypto/ec/ec_asn1.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/lib/libcrypto/ec/ec_asn1.c')

diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 1fb0670efe..f5a1331ba3 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.28 2018/07/10 22:06:14 tb Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.29 2018/07/15 05:38:48 jsg Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -793,7 +793,7 @@ ec_asn1_group2fieldid(const EC_GROUP * group, X9_62_FIELDID * field)
 
 	ok = 1;
 
- err:
+err:
 	BN_free(tmp);
 	return (ok);
 }
@@ -896,7 +896,7 @@ ec_asn1_group2curve(const EC_GROUP * group, X9_62_CURVE * curve)
 
 	ok = 1;
 
- err:
+err:
 	free(buffer_1);
 	free(buffer_2);
 	BN_free(tmp_1);
@@ -988,8 +988,7 @@ ec_asn1_group2parameters(const EC_GROUP * group, ECPARAMETERS * param)
 	}
 	ok = 1;
 
- err:
-	if (!ok) {
+err:	if (!ok) {
 		if (ret && !param)
 			ECPARAMETERS_free(ret);
 		ret = NULL;
@@ -1245,8 +1244,7 @@ ec_asn1_parameters2group(const ECPARAMETERS * params)
 	}
 	ok = 1;
 
- err:
-	if (!ok) {
+err:	if (!ok) {
 		EC_GROUP_clear_free(ret);
 		ret = NULL;
 	}
@@ -1314,7 +1312,7 @@ d2i_ECPKParameters(EC_GROUP ** a, const unsigned char **in, long len)
 		*a = group;
 	}
 
- err:
+err:
 	ECPKPARAMETERS_free(params);
 	return (group);
 }
@@ -1427,7 +1425,7 @@ d2i_ECPrivateKey(EC_KEY ** a, const unsigned char **in, long len)
 		*a = ret;
 	return (ret);
 
- err:
+err:
 	if (a == NULL || *a != ret)
 		EC_KEY_free(ret);
 	if (priv_key)
@@ -1512,7 +1510,7 @@ i2d_ECPrivateKey(EC_KEY * a, unsigned char **out)
 		goto err;
 	}
 	ok = 1;
- err:
+err:
 	free(buffer);
 	if (priv_key)
 		EC_PRIVATEKEY_free(priv_key);
-- 
cgit v1.2.3-55-g6feb