1 files changed, 50 insertions, 41 deletions

diff --git a/src/lib/libcrypto/asn1/a_print.c b/src/lib/libcrypto/asn1/a_print.c
index 9e421dba66..3e9a7c0f40 100644
--- a/src/lib/libcrypto/asn1/a_print.c
+++ b/src/lib/libcrypto/asn1/a_print.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -60,57 +60,66 @@
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 
-int ASN1_PRINTABLE_type(const unsigned char *s, int len)
+int
+ASN1_PRINTABLE_type(const unsigned char *s, int len)
 {
         int c;
-        int ia5=0;
-        int t61=0;
+        int ia5 = 0;
+        int t61 = 0;
 
-        if (len <= 0) len= -1;
-        if (s == NULL) return(V_ASN1_PRINTABLESTRING);
+        if (len <= 0)
+                len = -1;
+        if (s == NULL)
+                return (V_ASN1_PRINTABLESTRING);
 
         while ((*s) && (len-- != 0)) {
                 c= *(s++);
-                if (!(  ((c >= 'a') && (c <= 'z')) ||
-                        ((c >= 'A') && (c <= 'Z')) ||
-                        (c == ' ') ||
-                        ((c >= '0') && (c <= '9')) ||
-                        (c == ' ') || (c == '\'') ||
-                        (c == '(') || (c == ')') ||
-                        (c == '+') || (c == ',') ||
-                        (c == '-') || (c == '.') ||
-                        (c == '/') || (c == ':') ||
-                        (c == '=') || (c == '?')))
-                        ia5=1;
-                if (c&0x80)
-                        t61=1;
+                if (!(((c >= 'a') && (c <= 'z')) ||
+                    ((c >= 'A') && (c <= 'Z')) ||
+                    (c == ' ') ||
+                    ((c >= '0') && (c <= '9')) ||
+                    (c == ' ') || (c == '\'') ||
+                    (c == '(') || (c == ')') ||
+                    (c == '+') || (c == ',') ||
+                    (c == '-') || (c == '.') ||
+                    (c == '/') || (c == ':') ||
+                    (c == '=') || (c == '?')))
+                        ia5 = 1;
+                if (c & 0x80)
+                        t61 = 1;
         }
-        if (t61) return(V_ASN1_T61STRING);
-        if (ia5) return(V_ASN1_IA5STRING);
-        return(V_ASN1_PRINTABLESTRING);
+        if (t61)
+                return (V_ASN1_T61STRING);
+        if (ia5)
+                return (V_ASN1_IA5STRING);
+        return (V_ASN1_PRINTABLESTRING);
 }
 
-int ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s)
+int
+ASN1_UNIVERSALSTRING_to_string(ASN1_UNIVERSALSTRING *s)
 {
         int i;
         unsigned char *p;
 
-        if (s->type != V_ASN1_UNIVERSALSTRING) return(0);
-        if ((s->length%4) != 0) return(0);
-        p=s->data;
-        for (i=0; i<s->length; i+=4) {
+        if (s->type != V_ASN1_UNIVERSALSTRING)
+                return (0);
+        if ((s->length % 4) != 0)
+                return (0);
+        p = s->data;
+        for (i = 0; i < s->length; i += 4) {
                 if ((p[0] != '\0') || (p[1] != '\0') || (p[2] != '\0'))
                         break;
                 else
-                        p+=4;
+                        p += 4;
         }
-        if (i < s->length) return(0);
-        p=s->data;
-        for (i=3; i<s->length; i+=4) {
-                *(p++)=s->data[i];
+        if (i < s->length)
+                return (0);
+        p = s->data;
+        for (i = 3; i < s->length; i += 4) {
+                *(p++) = s->data[i];
         }
-        *(p)='\0';
-        s->length/=4;
-        s->type=ASN1_PRINTABLE_type(s->data,s->length);
-        return(1);
+        *(p) = '\0';
+        s->length /= 4;
+        s->type = ASN1_PRINTABLE_type(s->data, s->length);
+        return (1);
 }