6 files changed, 28 insertions, 28 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_attr.c b/src/lib/libcrypto/pkcs12/p12_attr.c
index 65bfaa039e..e8e340a2e2 100644
--- a/src/lib/libcrypto/pkcs12/p12_attr.c
+++ b/src/lib/libcrypto/pkcs12/p12_attr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_attr.c,v 1.12 2018/08/24 20:07:41 tb Exp $ */
+/* $OpenBSD: p12_attr.c,v 1.13 2021/07/09 14:07:59 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -125,10 +125,10 @@ PKCS12_get_attr_gen(const STACK_OF(X509_ATTRIBUTE) *attrs, int attr_nid)
 
         if (!attrs)
                 return NULL;
-        for (i = 0; i < sk_X509_ATTRIBUTE_num (attrs); i++) {
-                attrib = sk_X509_ATTRIBUTE_value (attrs, i);
-                if (OBJ_obj2nid (attrib->object) == attr_nid) {
-                        if (sk_ASN1_TYPE_num (attrib->value.set))
+        for (i = 0; i < sk_X509_ATTRIBUTE_num(attrs); i++) {
+                attrib = sk_X509_ATTRIBUTE_value(attrs, i);
+                if (OBJ_obj2nid(attrib->object) == attr_nid) {
+                        if (sk_ASN1_TYPE_num(attrib->value.set))
                                 return sk_ASN1_TYPE_value(attrib->value.set, 0);
                         else
                                 return NULL;
diff --git a/src/lib/libcrypto/pkcs12/p12_crpt.c b/src/lib/libcrypto/pkcs12/p12_crpt.c
index d1f7d71fd3..d21c9c178a 100644
--- a/src/lib/libcrypto/pkcs12/p12_crpt.c
+++ b/src/lib/libcrypto/pkcs12/p12_crpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_crpt.c,v 1.14 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: p12_crpt.c,v 1.15 2021/07/09 14:07:59 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -101,13 +101,13 @@ PKCS12_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
         }
         salt = pbe->salt->data;
         saltlen = pbe->salt->length;
-        if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_KEY_ID,
+        if (!PKCS12_key_gen(pass, passlen, salt, saltlen, PKCS12_KEY_ID,
             iter, EVP_CIPHER_key_length(cipher), key, md)) {
                 PKCS12error(PKCS12_R_KEY_GEN_ERROR);
                 PBEPARAM_free(pbe);
                 return 0;
         }
-        if (!PKCS12_key_gen (pass, passlen, salt, saltlen, PKCS12_IV_ID,
+        if (!PKCS12_key_gen(pass, passlen, salt, saltlen, PKCS12_IV_ID,
             iter, EVP_CIPHER_iv_length(cipher), iv, md)) {
                 PKCS12error(PKCS12_R_IV_GEN_ERROR);
                 PBEPARAM_free(pbe);
diff --git a/src/lib/libcrypto/pkcs12/p12_decr.c b/src/lib/libcrypto/pkcs12/p12_decr.c
index 1ef5c4a898..8ac7f17cfc 100644
--- a/src/lib/libcrypto/pkcs12/p12_decr.c
+++ b/src/lib/libcrypto/pkcs12/p12_decr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_decr.c,v 1.19 2018/05/13 14:22:34 tb Exp $ */
+/* $OpenBSD: p12_decr.c,v 1.20 2021/07/09 14:08:00 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -156,7 +156,7 @@ PKCS12_item_i2d_encrypt(X509_ALGOR *algor, const ASN1_ITEM *it,
         unsigned char *in = NULL;
         int inlen;
 
-        if (!(oct = ASN1_OCTET_STRING_new ())) {
+        if (!(oct = ASN1_OCTET_STRING_new())) {
                 PKCS12error(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
diff --git a/src/lib/libcrypto/pkcs12/p12_key.c b/src/lib/libcrypto/pkcs12/p12_key.c
index d419a9d835..2887948144 100644
--- a/src/lib/libcrypto/pkcs12/p12_key.c
+++ b/src/lib/libcrypto/pkcs12/p12_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_key.c,v 1.26 2017/05/02 03:59:45 deraadt Exp $ */
+/* $OpenBSD: p12_key.c,v 1.27 2021/07/09 14:08:00 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -143,7 +143,7 @@ PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                             !EVP_DigestFinal_ex(&ctx, Ai, NULL))
                                 goto err;
                 }
-                memcpy (out, Ai, min (n, u));
+                memcpy(out, Ai, min(n, u));
                 if (u >= n) {
                         ret = 1;
                         goto end;
@@ -153,9 +153,9 @@ PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                 for (j = 0; j < v; j++)
                         B[j] = Ai[j % u];
                 /* Work out B + 1 first then can use B as tmp space */
-                if (!BN_bin2bn (B, v, Bpl1))
+                if (!BN_bin2bn(B, v, Bpl1))
                         goto err;
-                if (!BN_add_word (Bpl1, 1))
+                if (!BN_add_word(Bpl1, 1))
                         goto err;
                 for (j = 0; j < Ilen; j += v) {
                         if (!BN_bin2bn(I + j, v, Ij))
@@ -164,12 +164,12 @@ PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                                 goto err;
                         if (!BN_bn2bin(Ij, B))
                                 goto err;
-                        Ijlen = BN_num_bytes (Ij);
+                        Ijlen = BN_num_bytes(Ij);
                         /* If more than 2^(v*8) - 1 cut off MSB */
                         if (Ijlen > v) {
-                                if (!BN_bn2bin (Ij, B))
+                                if (!BN_bn2bin(Ij, B))
                                         goto err;
-                                memcpy (I + j, B + 1, v);
+                                memcpy(I + j, B + 1, v);
 #ifndef PKCS12_BROKEN_KEYGEN
                                 /* If less than v bytes pad with zeroes */
                         } else if (Ijlen < v) {
@@ -177,7 +177,7 @@ PKCS12_key_gen_uni(unsigned char *pass, int passlen, unsigned char *salt,
                                 if (!BN_bn2bin(Ij, I + j + v - Ijlen))
                                         goto err;
 #endif
-                        } else if (!BN_bn2bin (Ij, I + j))
+                        } else if (!BN_bn2bin(Ij, I + j))
                                 goto err;
                 }
         }
diff --git a/src/lib/libcrypto/pkcs12/p12_kiss.c b/src/lib/libcrypto/pkcs12/p12_kiss.c
index e0385393d7..54a8092609 100644
--- a/src/lib/libcrypto/pkcs12/p12_kiss.c
+++ b/src/lib/libcrypto/pkcs12/p12_kiss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_kiss.c,v 1.20 2021/04/24 18:16:39 tb Exp $ */
+/* $OpenBSD: p12_kiss.c,v 1.21 2021/07/09 14:08:00 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -125,7 +125,7 @@ PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
                 return 0;
         }
 
-        if (!parse_pk12 (p12, pass, -1, pkey, ocerts)) {
+        if (!parse_pk12(p12, pass, -1, pkey, ocerts)) {
                 PKCS12error(PKCS12_R_PARSE_ERROR);
                 goto err;
         }
@@ -179,11 +179,11 @@ parse_pk12(PKCS12 *p12, const char *pass, int passlen, EVP_PKEY **pkey,
         int i, bagnid;
         PKCS7 *p7;
 
-        if (!(asafes = PKCS12_unpack_authsafes (p12)))
+        if (!(asafes = PKCS12_unpack_authsafes(p12)))
                 return 0;
-        for (i = 0; i < sk_PKCS7_num (asafes); i++) {
-                p7 = sk_PKCS7_value (asafes, i);
-                bagnid = OBJ_obj2nid (p7->type);
+        for (i = 0; i < sk_PKCS7_num(asafes); i++) {
+                p7 = sk_PKCS7_value(asafes, i);
+                bagnid = OBJ_obj2nid(p7->type);
                 if (bagnid == NID_pkcs7_data) {
                         bags = PKCS12_unpack_p7data(p7);
                 } else if (bagnid == NID_pkcs7_encrypted) {
@@ -229,10 +229,10 @@ parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen, EVP_PKEY **pkey,
         ASN1_BMPSTRING *fname = NULL;
         ASN1_OCTET_STRING *lkid = NULL;
 
-        if ((attrib = PKCS12_get_attr (bag, NID_friendlyName)))
+        if ((attrib = PKCS12_get_attr(bag, NID_friendlyName)))
                 fname = attrib->value.bmpstring;
 
-        if ((attrib = PKCS12_get_attr (bag, NID_localKeyID)))
+        if ((attrib = PKCS12_get_attr(bag, NID_localKeyID)))
                 lkid = attrib->value.octet_string;
 
         switch (OBJ_obj2nid(bag->type)) {
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index f3132ec75f..d45ab078fd 100644
--- a/src/lib/libcrypto/pkcs12/p12_mutl.c
+++ b/src/lib/libcrypto/pkcs12/p12_mutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_mutl.c,v 1.23 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: p12_mutl.c,v 1.24 2021/07/09 14:08:00 tb Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -192,7 +192,7 @@ PKCS12_setup_mac(PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
         if (!salt)
                 arc4random_buf(p12->mac->salt->data, saltlen);
         else
-                memcpy (p12->mac->salt->data, salt, saltlen);
+                memcpy(p12->mac->salt->data, salt, saltlen);
         p12->mac->dinfo->algor->algorithm = OBJ_nid2obj(EVP_MD_type(md_type));
         if (!(p12->mac->dinfo->algor->parameter = ASN1_TYPE_new())) {
                 PKCS12error(ERR_R_MALLOC_FAILURE);