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@

1 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index 21390aabd4..30f29ef545 100644
--- a/src/lib/libcrypto/ec/ec_ameth.c
+++ b/src/lib/libcrypto/ec/ec_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_ameth.c,v 1.21 2018/07/10 22:06:14 tb Exp $ */
+/* $OpenBSD: ec_ameth.c,v 1.22 2018/07/15 05:38:48 jsg Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -126,7 +126,7 @@ eckey_pub_encode(X509_PUBKEY * pk, const EVP_PKEY * pkey)
         if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_EC),
                 ptype, pval, penc, penclen))
                 return 1;
- err:
+err:
         if (ptype == V_ASN1_OBJECT)
                 ASN1_OBJECT_free(pval);
         else
@@ -177,7 +177,7 @@ eckey_type2param(int ptype, const void *pval)
 
         return eckey;
 
- ecerr:
+ecerr:
         if (eckey)
                 EC_KEY_free(eckey);
         return NULL;
@@ -210,7 +210,7 @@ eckey_pub_decode(EVP_PKEY * pkey, X509_PUBKEY * pubkey)
         EVP_PKEY_assign_EC_KEY(pkey, eckey);
         return 1;
 
- ecerr:
+ecerr:
         if (eckey)
                 EC_KEY_free(eckey);
         return 0;
@@ -290,9 +290,9 @@ eckey_priv_decode(EVP_PKEY * pkey, PKCS8_PRIV_KEY_INFO * p8)
         EVP_PKEY_assign_EC_KEY(pkey, eckey);
         return 1;
 
- ecliberr:
+ecliberr:
         ECerror(ERR_R_EC_LIB);
- ecerr:
+ecerr:
         if (eckey)
                 EC_KEY_free(eckey);
         return 0;
@@ -483,7 +483,7 @@ do_EC_KEY_print(BIO * bp, const EC_KEY * x, int off, int ktype)
         if (!ECPKParameters_print(bp, group, off))
                 goto err;
         ret = 1;
- err:
+err:
         if (!ret)
                 ECerror(reason);
         BN_free(pub_key);