1 files changed, 39 insertions, 34 deletions

diff --git a/crypto/o_str.c b/crypto/o_str.c
index a6598171535e..d7090acef45b 100644
--- a/crypto/o_str.c
+++ b/crypto/o_str.c
@@ -18,7 +18,7 @@
 #define DEFAULT_SEPARATOR ':'
 #define CH_ZERO '\0'
 
-char *CRYPTO_strdup(const char *str, const char* file, int line)
+char *CRYPTO_strdup(const char *str, const char *file, int line)
 {
     char *ret;
 
@@ -30,7 +30,7 @@ char *CRYPTO_strdup(const char *str, const char* file, int line)
     return ret;
 }
 
-char *CRYPTO_strndup(const char *str, size_t s, const char* file, int line)
+char *CRYPTO_strndup(const char *str, size_t s, const char *file, int line)
 {
     size_t maxlen;
     char *ret;
@@ -48,7 +48,7 @@ char *CRYPTO_strndup(const char *str, size_t s, const char* file, int line)
     return ret;
 }
 
-void *CRYPTO_memdup(const void *data, size_t siz, const char* file, int line)
+void *CRYPTO_memdup(const void *data, size_t siz, const char *file, int line)
 {
     void *ret;
 
@@ -67,7 +67,8 @@ size_t OPENSSL_strnlen(const char *str, size_t maxlen)
 {
     const char *p;
 
-    for (p = str; maxlen-- != 0 && *p != CH_ZERO; ++p) ;
+    for (p = str; maxlen-- != 0 && *p != CH_ZERO; ++p)
+        ;
 
     return p - str;
 }
@@ -108,35 +109,41 @@ int OPENSSL_hexchar2int(unsigned char c)
     case '3':
         return 3;
     case '4':
-          return 4;
+        return 4;
     case '5':
-          return 5;
+        return 5;
     case '6':
-          return 6;
+        return 6;
     case '7':
-          return 7;
+        return 7;
     case '8':
-          return 8;
+        return 8;
     case '9':
-          return 9;
-    case 'a': case 'A':
-          return 0x0A;
-    case 'b': case 'B':
-          return 0x0B;
-    case 'c': case 'C':
-          return 0x0C;
-    case 'd': case 'D':
-          return 0x0D;
-    case 'e': case 'E':
-          return 0x0E;
-    case 'f': case 'F':
-          return 0x0F;
+        return 9;
+    case 'a':
+    case 'A':
+        return 0x0A;
+    case 'b':
+    case 'B':
+        return 0x0B;
+    case 'c':
+    case 'C':
+        return 0x0C;
+    case 'd':
+    case 'D':
+        return 0x0D;
+    case 'e':
+    case 'E':
+        return 0x0E;
+    case 'f':
+    case 'F':
+        return 0x0F;
     }
     return -1;
 }
 
 static int hexstr2buf_sep(unsigned char *buf, size_t buf_n, size_t *buflen,
-                          const char *str, const char sep)
+    const char *str, const char sep)
 {
     unsigned char *q;
     unsigned char ch, cl;
@@ -144,7 +151,7 @@ static int hexstr2buf_sep(unsigned char *buf, size_t buf_n, size_t *buflen,
     const unsigned char *p;
     size_t cnt;
 
-    for (p = (const unsigned char *)str, q = buf, cnt = 0; *p; ) {
+    for (p = (const unsigned char *)str, q = buf, cnt = 0; *p;) {
         ch = *p++;
         /* A separator of CH_ZERO means there is no separator */
         if (ch == sep && sep != CH_ZERO)
@@ -179,13 +186,13 @@ static int hexstr2buf_sep(unsigned char *buf, size_t buf_n, size_t *buflen,
  * Given a string of hex digits convert to a buffer
  */
 int OPENSSL_hexstr2buf_ex(unsigned char *buf, size_t buf_n, size_t *buflen,
-                          const char *str, const char sep)
+    const char *str, const char sep)
 {
     return hexstr2buf_sep(buf, buf_n, buflen, str, sep);
 }
 
 unsigned char *ossl_hexstr2buf_sep(const char *str, long *buflen,
-                                   const char sep)
+    const char sep)
 {
     unsigned char *buf;
     size_t buf_n, tmp_buflen;
@@ -219,8 +226,8 @@ unsigned char *OPENSSL_hexstr2buf(const char *str, long *buflen)
 }
 
 static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlength,
-                          const unsigned char *buf, size_t buflen,
-                          const char sep)
+    const unsigned char *buf, size_t buflen,
+    const char sep)
 {
     static const char hexdig[] = "0123456789ABCDEF";
     const unsigned char *p;
@@ -259,8 +266,8 @@ static int buf2hexstr_sep(char *str, size_t str_n, size_t *strlength,
 }
 
 int OPENSSL_buf2hexstr_ex(char *str, size_t str_n, size_t *strlength,
-                          const unsigned char *buf, size_t buflen,
-                          const char sep)
+    const unsigned char *buf, size_t buflen,
+    const char sep)
 {
     return buf2hexstr_sep(str, str_n, strlength, buf, buflen, sep);
 }
@@ -285,7 +292,6 @@ char *ossl_buf2hexstr_sep(const unsigned char *buf, long buflen, char sep)
     return NULL;
 }
 
-
 /*
  * Given a buffer of length 'len' return a OPENSSL_malloc'ed string with its
  * hex representation @@@ (Contents of buffer are always kept in ASCII, also
@@ -298,7 +304,7 @@ char *OPENSSL_buf2hexstr(const unsigned char *buf, long buflen)
 
 int openssl_strerror_r(int errnum, char *buf, size_t buflen)
 {
-#if defined(_MSC_VER) && _MSC_VER>=1400 && !defined(_WIN32_WCE)
+#if defined(_MSC_VER) && _MSC_VER >= 1400 && !defined(_WIN32_WCE)
     return !strerror_s(buf, buflen, errnum);
 #elif defined(_GNU_SOURCE)
     char *err;
@@ -321,8 +327,7 @@ int openssl_strerror_r(int errnum, char *buf, size_t buflen)
     if (err != buf)
         OPENSSL_strlcpy(buf, err, buflen);
     return 1;
-#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \
-      (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
+#elif (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 600)
     /*
      * We can use "real" strerror_r. The OpenSSL version differs in that it
      * gives 1 on success and 0 on failure for consistency with other OpenSSL