Indent labels by a space so they don't obliterate function names in diffs.

19 files changed, 93 insertions, 91 deletions

diff --git a/src/lib/libcrypto/ec/ec2_mult.c b/src/lib/libcrypto/ec/ec2_mult.c
index 1c8bb18076..463802950d 100644
--- a/src/lib/libcrypto/ec/ec2_mult.c
+++ b/src/lib/libcrypto/ec/ec2_mult.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec2_mult.c,v 1.9 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ec2_mult.c,v 1.10 2018/07/10 22:06:14 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -111,7 +111,7 @@ gf2m_Mdouble(const EC_GROUP *group, BIGNUM *x, BIGNUM *z, BN_CTX *ctx)
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         return ret;
 }
@@ -155,7 +155,7 @@ gf2m_Madd(const EC_GROUP *group, const BIGNUM *x, BIGNUM *x1, BIGNUM *z1,
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         return ret;
 }
@@ -243,7 +243,7 @@ gf2m_Mxy(const EC_GROUP *group, const BIGNUM *x, const BIGNUM *y, BIGNUM *x1,
 
         ret = 2;
 
-err:
+ err:
         BN_CTX_end(ctx);
         return ret;
 }
@@ -356,7 +356,7 @@ ec_GF2m_montgomery_point_multiply(const EC_GROUP *group, EC_POINT *r,
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         return ret;
 }
@@ -424,7 +424,7 @@ ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 
         ret = 1;
 
-err:
+ err:
         EC_POINT_free(p);
         EC_POINT_free(acc);
         BN_CTX_free(new_ctx);
diff --git a/src/lib/libcrypto/ec/ec2_oct.c b/src/lib/libcrypto/ec/ec2_oct.c
index f434d726d2..1727f780a3 100644
--- a/src/lib/libcrypto/ec/ec2_oct.c
+++ b/src/lib/libcrypto/ec/ec2_oct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec2_oct.c,v 1.8 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ec2_oct.c,v 1.9 2018/07/10 22:06:14 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -157,7 +157,7 @@ ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *point
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -272,7 +272,7 @@ ec_GF2m_simple_point2oct(const EC_GROUP *group, const EC_POINT *point,
         BN_CTX_free(new_ctx);
         return ret;
 
-err:
+ err:
         if (used_ctx)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
@@ -374,7 +374,7 @@ ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
         }
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
diff --git a/src/lib/libcrypto/ec/ec2_smpl.c b/src/lib/libcrypto/ec/ec2_smpl.c
index 358664afc1..f1cbd3f3c4 100644
--- a/src/lib/libcrypto/ec/ec2_smpl.c
+++ b/src/lib/libcrypto/ec/ec2_smpl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec2_smpl.c,v 1.16 2018/07/10 21:55:49 tb Exp $ */
+/* $OpenBSD: ec2_smpl.c,v 1.17 2018/07/10 22:06:14 tb Exp $ */
 /* ====================================================================
  * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
  *
@@ -228,7 +228,7 @@ ec_GF2m_simple_group_set_curve(EC_GROUP * group,
                 group->b.d[i] = 0;
 
         ret = 1;
-err:
+ err:
         return ret;
 }
 
@@ -256,7 +256,7 @@ ec_GF2m_simple_group_get_curve(const EC_GROUP *group,
         }
         ret = 1;
 
-err:
+ err:
         return ret;
 }
 
@@ -302,7 +302,7 @@ ec_GF2m_simple_group_check_discriminant(const EC_GROUP * group, BN_CTX * ctx)
 
         ret = 1;
 
-err:
+ err:
         if (ctx != NULL)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
@@ -394,7 +394,7 @@ ec_GF2m_simple_point_set_affine_coordinates(const EC_GROUP * group, EC_POINT * p
         point->Z_is_one = 1;
         ret = 1;
 
-err:
+ err:
         return ret;
 }
 
@@ -428,7 +428,7 @@ ec_GF2m_simple_point_get_affine_coordinates(const EC_GROUP *group,
         }
         ret = 1;
 
-err:
+ err:
         return ret;
 }
 
@@ -545,7 +545,7 @@ ec_GF2m_simple_add(const EC_GROUP *group, EC_POINT *r, const EC_POINT *a,
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -637,7 +637,7 @@ ec_GF2m_simple_is_on_curve(const EC_GROUP *group, const EC_POINT *point, BN_CTX
         if (!BN_GF2m_add(lh, lh, y2))
                 goto err;
         ret = BN_is_zero(lh);
-err:
+ err:
         if (ctx)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
@@ -689,7 +689,7 @@ ec_GF2m_simple_cmp(const EC_GROUP *group, const EC_POINT *a,
                 goto err;
         ret = ((BN_cmp(aX, bX) == 0) && BN_cmp(aY, bY) == 0) ? 0 : 1;
 
-err:
+ err:
         if (ctx)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
@@ -730,7 +730,7 @@ ec_GF2m_simple_make_affine(const EC_GROUP * group, EC_POINT * point, BN_CTX * ct
 
         ret = 1;
 
-err:
+ err:
         if (ctx)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
diff --git a/src/lib/libcrypto/ec/ec_ameth.c b/src/lib/libcrypto/ec/ec_ameth.c
index 3d52b90383..21390aabd4 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.20 2018/05/01 19:01:28 tb Exp $ */
+/* $OpenBSD: ec_ameth.c,v 1.21 2018/07/10 22:06:14 tb 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);
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 5da7b2be89..1fb0670efe 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.27 2018/05/19 10:37:02 tb Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.28 2018/07/10 22:06:14 tb 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,7 +988,8 @@ 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;
@@ -1244,7 +1245,8 @@ ec_asn1_parameters2group(const ECPARAMETERS * params)
         }
         ok = 1;
 
-err:    if (!ok) {
+ err:
+        if (!ok) {
                 EC_GROUP_clear_free(ret);
                 ret = NULL;
         }
@@ -1312,7 +1314,7 @@ d2i_ECPKParameters(EC_GROUP ** a, const unsigned char **in, long len)
                 *a = group;
         }
 
-err:
+ err:
         ECPKPARAMETERS_free(params);
         return (group);
 }
@@ -1425,7 +1427,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)
@@ -1510,7 +1512,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);
diff --git a/src/lib/libcrypto/ec/ec_check.c b/src/lib/libcrypto/ec/ec_check.c
index bbb03498ac..b0c63331c6 100644
--- a/src/lib/libcrypto/ec/ec_check.c
+++ b/src/lib/libcrypto/ec/ec_check.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_check.c,v 1.6 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ec_check.c,v 1.7 2018/07/10 22:06:14 tb Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
  *
@@ -106,7 +106,7 @@ EC_GROUP_check(const EC_GROUP * group, BN_CTX * ctx)
         }
         ret = 1;
 
-err:
+ err:
         if (ctx != NULL)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
diff --git a/src/lib/libcrypto/ec/ec_curve.c b/src/lib/libcrypto/ec/ec_curve.c
index d4f6c28d1e..7bf85835dc 100644
--- a/src/lib/libcrypto/ec/ec_curve.c
+++ b/src/lib/libcrypto/ec/ec_curve.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_curve.c,v 1.16 2018/03/16 12:31:09 mpi Exp $ */
+/* $OpenBSD: ec_curve.c,v 1.17 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -3235,7 +3235,7 @@ ec_group_new_from_data(const ec_list_element curve)
                 }
         }
         ok = 1;
-err:
+ err:
         if (!ok) {
                 EC_GROUP_free(group);
                 group = NULL;
diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c
index 595b88cefc..33c9acccd7 100644
--- a/src/lib/libcrypto/ec/ec_key.c
+++ b/src/lib/libcrypto/ec/ec_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_key.c,v 1.14 2017/05/02 03:59:44 deraadt Exp $ */
+/* $OpenBSD: ec_key.c,v 1.15 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -253,7 +253,7 @@ EC_KEY_generate_key(EC_KEY * eckey)
 
         ok = 1;
 
-err:
+ err:
         BN_free(order);
         if (pub_key != NULL && eckey->pub_key == NULL)
                 EC_POINT_free(pub_key);
@@ -324,7 +324,7 @@ EC_KEY_check_key(const EC_KEY * eckey)
                 }
         }
         ok = 1;
-err:
+ err:
         BN_CTX_free(ctx);
         EC_POINT_free(point);
         return (ok);
@@ -395,7 +395,7 @@ EC_KEY_set_public_key_affine_coordinates(EC_KEY * key, BIGNUM * x, BIGNUM * y)
 
         ok = 1;
 
-err:
+ err:
         BN_CTX_free(ctx);
         EC_POINT_free(point);
         return ok;
diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c
index 5580375321..1d1daca166 100644
--- a/src/lib/libcrypto/ec/ec_lib.c
+++ b/src/lib/libcrypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lib.c,v 1.25 2018/07/10 21:55:49 tb Exp $ */
+/* $OpenBSD: ec_lib.c,v 1.26 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -526,7 +526,7 @@ EC_GROUP_cmp(const EC_GROUP * a, const EC_GROUP * b, BN_CTX * ctx)
 
         return r;
 
-err:
+ err:
         BN_CTX_end(ctx);
         if (ctx_new)
                 BN_CTX_free(ctx);
diff --git a/src/lib/libcrypto/ec/ec_mult.c b/src/lib/libcrypto/ec/ec_mult.c
index a565263bb6..08bc8c380c 100644
--- a/src/lib/libcrypto/ec/ec_mult.c
+++ b/src/lib/libcrypto/ec/ec_mult.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_mult.c,v 1.21 2017/05/02 03:59:44 deraadt Exp $ */
+/* $OpenBSD: ec_mult.c,v 1.22 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project.
  */
@@ -301,7 +301,7 @@ compute_wNAF(const BIGNUM * scalar, int w, size_t * ret_len)
         len = j;
         ok = 1;
 
-err:
+ err:
         if (!ok) {
                 free(r);
                 r = NULL;
@@ -678,7 +678,7 @@ ec_wNAF_mul(const EC_GROUP * group, EC_POINT * r, const BIGNUM * scalar,
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_free(new_ctx);
         EC_POINT_free(tmp);
         free(wsize);
@@ -857,7 +857,7 @@ ec_wNAF_precompute_mult(EC_GROUP * group, BN_CTX * ctx)
         pre_comp = NULL;
 
         ret = 1;
-err:
+ err:
         if (ctx != NULL)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
diff --git a/src/lib/libcrypto/ec/eck_prn.c b/src/lib/libcrypto/ec/eck_prn.c
index 653d78e5cd..0291de9613 100644
--- a/src/lib/libcrypto/ec/eck_prn.c
+++ b/src/lib/libcrypto/ec/eck_prn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eck_prn.c,v 1.12 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: eck_prn.c,v 1.13 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -321,7 +321,7 @@ ECPKParameters_print(BIO * bp, const EC_GROUP * x, int off)
                         goto err;
         }
         ret = 1;
-err:
+ err:
         if (!ret)
                 ECerror(reason);
         BN_free(p);
diff --git a/src/lib/libcrypto/ec/ecp_mont.c b/src/lib/libcrypto/ec/ecp_mont.c
index 8b4c529222..302f833306 100644
--- a/src/lib/libcrypto/ec/ecp_mont.c
+++ b/src/lib/libcrypto/ec/ecp_mont.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_mont.c,v 1.12 2018/07/10 21:55:49 tb Exp $ */
+/* $OpenBSD: ecp_mont.c,v 1.13 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -175,7 +175,7 @@ ec_GFp_mont_group_copy(EC_GROUP * dest, const EC_GROUP * src)
         }
         return 1;
 
-err:
+ err:
         if (dest->field_data1 != NULL) {
                 BN_MONT_CTX_free(dest->field_data1);
                 dest->field_data1 = NULL;
@@ -228,7 +228,7 @@ ec_GFp_mont_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a,
                 BN_free(group->field_data2);
                 group->field_data2 = NULL;
         }
-err:
+ err:
         BN_CTX_free(new_ctx);
         BN_MONT_CTX_free(mont);
         BN_free(one);
diff --git a/src/lib/libcrypto/ec/ecp_nist.c b/src/lib/libcrypto/ec/ecp_nist.c
index 24cba64d2e..8aa9f49592 100644
--- a/src/lib/libcrypto/ec/ecp_nist.c
+++ b/src/lib/libcrypto/ec/ecp_nist.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_nist.c,v 1.10 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ecp_nist.c,v 1.11 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -151,7 +151,7 @@ ec_GFp_nist_group_set_curve(EC_GROUP *group, const BIGNUM *p,
 
         ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -179,7 +179,7 @@ ec_GFp_nist_field_mul(const EC_GROUP *group, BIGNUM *r, const BIGNUM *a,
                 goto err;
 
         ret = 1;
-err:
+ err:
         BN_CTX_free(ctx_new);
         return ret;
 }
@@ -206,7 +206,7 @@ ec_GFp_nist_field_sqr(const EC_GROUP * group, BIGNUM * r, const BIGNUM * a,
                 goto err;
 
         ret = 1;
-err:
+ err:
         BN_CTX_free(ctx_new);
         return ret;
 }
diff --git a/src/lib/libcrypto/ec/ecp_nistp224.c b/src/lib/libcrypto/ec/ecp_nistp224.c
index fce74578c7..3921508094 100644
--- a/src/lib/libcrypto/ec/ecp_nistp224.c
+++ b/src/lib/libcrypto/ec/ecp_nistp224.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_nistp224.c,v 1.19 2017/05/02 03:59:44 deraadt Exp $ */
+/* $OpenBSD: ecp_nistp224.c,v 1.20 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Written by Emilia Kasper (Google) for the OpenSSL project.
  */
@@ -1281,7 +1281,7 @@ ec_GFp_nistp224_group_set_curve(EC_GROUP * group, const BIGNUM * p,
         }
         group->field_mod_func = BN_nist_mod_224;
         ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -1537,7 +1537,7 @@ ec_GFp_nistp224_points_mul(const EC_GROUP * group, EC_POINT * r,
         }
         ret = EC_POINT_set_Jprojective_coordinates_GFp(group, r, x, y, z, ctx);
 
-err:
+ err:
         BN_CTX_end(ctx);
         EC_POINT_free(generator);
         BN_CTX_free(new_ctx);
@@ -1666,7 +1666,7 @@ ec_GFp_nistp224_precompute_mult(EC_GROUP * group, BN_CTX * ctx)
                 goto err;
         ret = 1;
         pre = NULL;
-err:
+ err:
         BN_CTX_end(ctx);
         EC_POINT_free(generator);
         BN_CTX_free(new_ctx);
diff --git a/src/lib/libcrypto/ec/ecp_nistp256.c b/src/lib/libcrypto/ec/ecp_nistp256.c
index 6f3ec3c250..7046dcebc0 100644
--- a/src/lib/libcrypto/ec/ecp_nistp256.c
+++ b/src/lib/libcrypto/ec/ecp_nistp256.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_nistp256.c,v 1.18 2017/05/02 03:59:44 deraadt Exp $ */
+/* $OpenBSD: ecp_nistp256.c,v 1.19 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Written by Adam Langley (Google) for the OpenSSL project
  */
@@ -1830,7 +1830,7 @@ ec_GFp_nistp256_group_set_curve(EC_GROUP * group, const BIGNUM * p,
         }
         group->field_mod_func = BN_nist_mod_256;
         ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -2090,7 +2090,7 @@ ec_GFp_nistp256_points_mul(const EC_GROUP * group, EC_POINT * r,
         }
         ret = EC_POINT_set_Jprojective_coordinates_GFp(group, r, x, y, z, ctx);
 
-err:
+ err:
         BN_CTX_end(ctx);
         EC_POINT_free(generator);
         BN_CTX_free(new_ctx);
@@ -2213,7 +2213,7 @@ ec_GFp_nistp256_precompute_mult(EC_GROUP * group, BN_CTX * ctx)
                 goto err;
         ret = 1;
         pre = NULL;
-err:
+ err:
         BN_CTX_end(ctx);
         EC_POINT_free(generator);
         BN_CTX_free(new_ctx);
diff --git a/src/lib/libcrypto/ec/ecp_nistp521.c b/src/lib/libcrypto/ec/ecp_nistp521.c
index 6dbc266937..7c20daae28 100644
--- a/src/lib/libcrypto/ec/ecp_nistp521.c
+++ b/src/lib/libcrypto/ec/ecp_nistp521.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_nistp521.c,v 1.19 2017/05/02 03:59:44 deraadt Exp $ */
+/* $OpenBSD: ecp_nistp521.c,v 1.20 2018/07/10 22:06:14 tb Exp $ */
 /*
  * Written by Adam Langley (Google) for the OpenSSL project
  */
@@ -1721,7 +1721,7 @@ ec_GFp_nistp521_group_set_curve(EC_GROUP * group, const BIGNUM * p,
         }
         group->field_mod_func = BN_nist_mod_521;
         ret = ec_GFp_simple_group_set_curve(group, p, a, b, ctx);
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -1979,7 +1979,7 @@ ec_GFp_nistp521_points_mul(const EC_GROUP * group, EC_POINT * r,
         }
         ret = EC_POINT_set_Jprojective_coordinates_GFp(group, r, x, y, z, ctx);
 
-err:
+ err:
         BN_CTX_end(ctx);
         EC_POINT_free(generator);
         BN_CTX_free(new_ctx);
@@ -2088,7 +2088,7 @@ ec_GFp_nistp521_precompute_mult(EC_GROUP * group, BN_CTX * ctx)
                 goto err;
         ret = 1;
         pre = NULL;
-err:
+ err:
         BN_CTX_end(ctx);
         EC_POINT_free(generator);
         BN_CTX_free(new_ctx);
diff --git a/src/lib/libcrypto/ec/ecp_nistz256.c b/src/lib/libcrypto/ec/ecp_nistz256.c
index b3b8f74b14..3d52938721 100644
--- a/src/lib/libcrypto/ec/ecp_nistz256.c
+++ b/src/lib/libcrypto/ec/ecp_nistz256.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ecp_nistz256.c,v 1.3 2017/05/02 03:59:44 deraadt Exp $        */
+/*      $OpenBSD: ecp_nistz256.c,v 1.4 2018/07/10 22:06:14 tb Exp $     */
 /* Copyright (c) 2014, Intel Corporation.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -565,7 +565,7 @@ ecp_nistz256_windowed_mul(const EC_GROUP *group, P256_POINT *r,
         }
 
         ret = 1;
-err:
+ err:
         free(table);
         free(p_str);
         free(scalars);
@@ -712,7 +712,7 @@ ecp_nistz256_mult_precompute(EC_GROUP *group, BN_CTX *ctx)
         ec_pre_comp = NULL;
         ret = 1;
 
-err:
+ err:
         if (ctx != NULL)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
@@ -985,7 +985,7 @@ ecp_nistz256_points_mul(const EC_GROUP *group, EC_POINT *r,
 
         ret = 1;
 
-err:
+ err:
         if (ctx)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
diff --git a/src/lib/libcrypto/ec/ecp_oct.c b/src/lib/libcrypto/ec/ecp_oct.c
index b93b516907..da9eccfe6a 100644
--- a/src/lib/libcrypto/ec/ecp_oct.c
+++ b/src/lib/libcrypto/ec/ecp_oct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_oct.c,v 1.8 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ecp_oct.c,v 1.9 2018/07/10 22:06:14 tb Exp $ */
 /* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * for the OpenSSL project.
  * Includes code written by Bodo Moeller for the OpenSSL project.
@@ -190,7 +190,7 @@ ec_GFp_simple_set_compressed_coordinates(const EC_GROUP * group,
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -294,7 +294,7 @@ ec_GFp_simple_point2oct(const EC_GROUP * group, const EC_POINT * point, point_co
         BN_CTX_free(new_ctx);
         return ret;
 
-err:
+ err:
         if (used_ctx)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
@@ -388,7 +388,7 @@ ec_GFp_simple_oct2point(const EC_GROUP * group, EC_POINT * point,
         }
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
diff --git a/src/lib/libcrypto/ec/ecp_smpl.c b/src/lib/libcrypto/ec/ecp_smpl.c
index 402ee2294d..57e8345364 100644
--- a/src/lib/libcrypto/ec/ecp_smpl.c
+++ b/src/lib/libcrypto/ec/ecp_smpl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecp_smpl.c,v 1.18 2018/07/10 21:55:49 tb Exp $ */
+/* $OpenBSD: ecp_smpl.c,v 1.19 2018/07/10 22:06:14 tb Exp $ */
 /* Includes code written by Lenka Fibikova <fibikova@exp-math.uni-essen.de>
  * for the OpenSSL project.
  * Includes code written by Bodo Moeller for the OpenSSL project.
@@ -223,7 +223,7 @@ ec_GFp_simple_group_set_curve(EC_GROUP * group,
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -268,7 +268,7 @@ ec_GFp_simple_group_get_curve(const EC_GROUP * group, BIGNUM * p, BIGNUM * a, BI
         }
         ret = 1;
 
-err:
+ err:
         BN_CTX_free(new_ctx);
         return ret;
 }
@@ -349,7 +349,7 @@ ec_GFp_simple_group_check_discriminant(const EC_GROUP * group, BN_CTX * ctx)
         }
         ret = 1;
 
-err:
+ err:
         if (ctx != NULL)
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
@@ -459,7 +459,7 @@ ec_GFp_simple_set_Jprojective_coordinates_GFp(const EC_GROUP * group, EC_POINT *
         }
         ret = 1;
 
-err:
+ err:
         BN_CTX_free(new_ctx);
         return ret;
 }
@@ -507,7 +507,7 @@ ec_GFp_simple_get_Jprojective_coordinates_GFp(const EC_GROUP * group, const EC_P
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_free(new_ctx);
         return ret;
 }
@@ -627,7 +627,7 @@ ec_GFp_simple_point_get_affine_coordinates(const EC_GROUP * group, const EC_POIN
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -814,7 +814,7 @@ ec_GFp_simple_add(const EC_GROUP * group, EC_POINT * r, const EC_POINT * a, cons
 
         ret = 1;
 
-end:
+ end:
         if (ctx)                /* otherwise we already called BN_CTX_end */
                 BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
@@ -957,7 +957,7 @@ ec_GFp_simple_dbl(const EC_GROUP * group, EC_POINT * r, const EC_POINT * a, BN_C
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -1078,7 +1078,7 @@ ec_GFp_simple_is_on_curve(const EC_GROUP * group, const EC_POINT * point, BN_CTX
 
         ret = (0 == BN_ucmp(tmp, rh));
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -1180,7 +1180,7 @@ ec_GFp_simple_cmp(const EC_GROUP * group, const EC_POINT * a, const EC_POINT * b
         /* points are equal */
         ret = 0;
 
-end:
+ end:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -1218,7 +1218,7 @@ ec_GFp_simple_make_affine(const EC_GROUP * group, EC_POINT * point, BN_CTX * ctx
         }
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         return ret;
@@ -1383,7 +1383,7 @@ ec_GFp_simple_points_make_affine(const EC_GROUP * group, size_t num, EC_POINT *
 
         ret = 1;
 
-err:
+ err:
         BN_CTX_end(ctx);
         BN_CTX_free(new_ctx);
         if (heap != NULL) {