1 files changed, 56 insertions, 31 deletions

diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c
index 372b94e412..618e6c699f 100644
--- a/src/lib/libcrypto/pkcs12/p12_utl.c
+++ b/src/lib/libcrypto/pkcs12/p12_utl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_utl.c,v 1.9 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: p12_utl.c,v 1.10 2014/07/08 09:24:53 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -10,7 +10,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -62,81 +62,106 @@
 
 /* Cheap and nasty Unicode stuff */
 
-unsigned char *OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)
+unsigned char *
+OPENSSL_asc2uni(const char *asc, int asclen, unsigned char **uni, int *unilen)
 {
         int ulen, i;
         unsigned char *unitmp;
-        if (asclen == -1) asclen = strlen(asc);
-        ulen = asclen*2  + 2;
-        if (!(unitmp = malloc(ulen))) return NULL;
-        for (i = 0; i < ulen - 2; i+=2) {
+
+        if (asclen == -1)
+                asclen = strlen(asc);
+        ulen = asclen * 2 + 2;
+        if (!(unitmp = malloc(ulen)))
+                return NULL;
+        for (i = 0; i < ulen - 2; i += 2) {
                 unitmp[i] = 0;
-                unitmp[i + 1] = asc[i>>1];
+                unitmp[i + 1] = asc[i >> 1];
         }
         /* Make result double null terminated */
         unitmp[ulen - 2] = 0;
         unitmp[ulen - 1] = 0;
-        if (unilen) *unilen = ulen;
-        if (uni) *uni = unitmp;
+        if (unilen)
+                *unilen = ulen;
+        if (uni)
+                *uni = unitmp;
         return unitmp;
 }
 
-char *OPENSSL_uni2asc(unsigned char *uni, int unilen)
+char *
+OPENSSL_uni2asc(unsigned char *uni, int unilen)
 {
         int asclen, i;
         char *asctmp;
+
         asclen = unilen / 2;
         /* If no terminating zero allow for one */
-        if (!unilen || uni[unilen - 1]) asclen++;
+        if (!unilen || uni[unilen - 1])
+                asclen++;
         uni++;
-        if (!(asctmp = malloc(asclen))) return NULL;
-        for (i = 0; i < unilen; i+=2) asctmp[i>>1] = uni[i];
+        if (!(asctmp = malloc(asclen)))
+                return NULL;
+        for (i = 0; i < unilen; i += 2)
+                asctmp[i >> 1] = uni[i];
         asctmp[asclen - 1] = 0;
         return asctmp;
 }
 
-int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
+int
+i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
 {
         return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
 }
 
-int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
+int
+i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
 {
         return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
 }
 
-PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
+PKCS12 *
+d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
 {
         return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS12), bp, p12);
 }
-PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
+
+PKCS12 *
+d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
 {
-        return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
+            return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS12), fp, p12);
 }
 
-PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509)
+PKCS12_SAFEBAG *
+PKCS12_x5092certbag(X509 *x509)
 {
         return PKCS12_item_pack_safebag(x509, ASN1_ITEM_rptr(X509),
-                        NID_x509Certificate, NID_certBag);
+            NID_x509Certificate, NID_certBag);
 }
 
-PKCS12_SAFEBAG *PKCS12_x509crl2certbag(X509_CRL *crl)
+PKCS12_SAFEBAG *
+PKCS12_x509crl2certbag(X509_CRL *crl)
 {
         return PKCS12_item_pack_safebag(crl, ASN1_ITEM_rptr(X509_CRL),
-                        NID_x509Crl, NID_crlBag);
+            NID_x509Crl, NID_crlBag);
 }
 
-X509 *PKCS12_certbag2x509(PKCS12_SAFEBAG *bag)
+X509 *
+PKCS12_certbag2x509(PKCS12_SAFEBAG *bag)
 {
-        if(M_PKCS12_bag_type(bag) != NID_certBag) return NULL;
-        if(M_PKCS12_cert_bag_type(bag) != NID_x509Certificate) return NULL;
-        return ASN1_item_unpack(bag->value.bag->value.octet, ASN1_ITEM_rptr(X509));
+        if (M_PKCS12_bag_type(bag) != NID_certBag)
+                return NULL;
+        if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate)
+                return NULL;
+        return ASN1_item_unpack(bag->value.bag->value.octet,
+            ASN1_ITEM_rptr(X509));
 }
 
-X509_CRL *PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag)
+X509_CRL *
+PKCS12_certbag2x509crl(PKCS12_SAFEBAG *bag)
 {
-        if(M_PKCS12_bag_type(bag) != NID_crlBag) return NULL;
-        if(M_PKCS12_cert_bag_type(bag) != NID_x509Crl) return NULL;
+        if (M_PKCS12_bag_type(bag) != NID_crlBag)
+                return NULL;
+        if (M_PKCS12_cert_bag_type(bag) != NID_x509Crl)
+                return NULL;
         return ASN1_item_unpack(bag->value.bag->value.octet,
-                                                        ASN1_ITEM_rptr(X509_CRL));
+            ASN1_ITEM_rptr(X509_CRL));
 }