KNF.

4 files changed, 502 insertions, 510 deletions

diff --git a/src/lib/libcrypto/txt_db/txt_db.c b/src/lib/libcrypto/txt_db/txt_db.c
index c1e7a79a1a..69fd2ba5bf 100644
--- a/src/lib/libcrypto/txt_db/txt_db.c
+++ b/src/lib/libcrypto/txt_db/txt_db.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
@@ -66,323 +66,320 @@
 #undef BUFSIZE
 #define BUFSIZE 512
 
-const char TXT_DB_version[]="TXT_DB" OPENSSL_VERSION_PTEXT;
+const char TXT_DB_version[] = "TXT_DB" OPENSSL_VERSION_PTEXT;
 
-TXT_DB *TXT_DB_read(BIO *in, int num)
-        {
-        TXT_DB *ret=NULL;
-        int er=1;
-        int esc=0;
-        long ln=0;
-        int i,add,n;
-        int size=BUFSIZE;
-        int offset=0;
-        char *p,*f;
+TXT_DB *
+TXT_DB_read(BIO *in, int num)
+{
+        TXT_DB *ret = NULL;
+        int er = 1;
+        int esc = 0;
+        long ln = 0;
+        int i, add, n;
+        int size = BUFSIZE;
+        int offset = 0;
+        char *p, *f;
         OPENSSL_STRING *pp;
-        BUF_MEM *buf=NULL;
+        BUF_MEM *buf = NULL;
 
-        if ((buf=BUF_MEM_new()) == NULL) goto err;
-        if (!BUF_MEM_grow(buf,size)) goto err;
+        if ((buf = BUF_MEM_new()) == NULL)
+                goto err;
+        if (!BUF_MEM_grow(buf, size))
+                goto err;
 
-        if ((ret=malloc(sizeof(TXT_DB))) == NULL)
+        if ((ret = malloc(sizeof(TXT_DB))) == NULL)
                 goto err;
-        ret->num_fields=num;
-        ret->index=NULL;
-        ret->qual=NULL;
-        if ((ret->data=sk_OPENSSL_PSTRING_new_null()) == NULL)
+        ret->num_fields = num;
+        ret->index = NULL;
+        ret->qual = NULL;
+        if ((ret->data = sk_OPENSSL_PSTRING_new_null()) == NULL)
                 goto err;
-        if ((ret->index=malloc(sizeof(*ret->index)*num)) == NULL)
+        if ((ret->index = malloc(sizeof(*ret->index)*num)) == NULL)
                 goto err;
-        if ((ret->qual=malloc(sizeof(*(ret->qual))*num)) == NULL)
+        if ((ret->qual = malloc(sizeof(*(ret->qual))*num)) == NULL)
                 goto err;
-        for (i=0; i<num; i++)
-                {
-                ret->index[i]=NULL;
-                ret->qual[i]=NULL;
-                }
+        for (i = 0; i < num; i++) {
+                ret->index[i] = NULL;
+                ret->qual[i] = NULL;
+        }
 
-        add=(num+1)*sizeof(char *);
-        buf->data[size-1]='\0';
-        offset=0;
-        for (;;)
-                {
-                if (offset != 0)
-                        {
-                        size+=BUFSIZE;
-                        if (!BUF_MEM_grow_clean(buf,size)) goto err;
-                        }
-                buf->data[offset]='\0';
-                BIO_gets(in,&(buf->data[offset]),size-offset);
+        add = (num + 1)*sizeof(char *);
+        buf->data[size-1] = '\0';
+        offset = 0;
+        for (;;) {
+                if (offset != 0) {
+                        size += BUFSIZE;
+                        if (!BUF_MEM_grow_clean(buf, size))
+                                goto err;
+                }
+                buf->data[offset] = '\0';
+                BIO_gets(in, &(buf->data[offset]), size - offset);
                 ln++;
-                if (buf->data[offset] == '\0') break;
-                if ((offset == 0) && (buf->data[0] == '#')) continue;
-                i=strlen(&(buf->data[offset]));
-                offset+=i;
+                if (buf->data[offset] == '\0')
+                        break;
+                if ((offset == 0) && (buf->data[0] == '#'))
+                        continue;
+                i = strlen(&(buf->data[offset]));
+                offset += i;
                 if (buf->data[offset-1] != '\n')
                         continue;
-                else
-                        {
-                        buf->data[offset-1]='\0'; /* blat the '\n' */
-                        if (!(p=malloc(add+offset))) goto err;
-                        offset=0;
-                        }
-                pp=(char **)p;
-                p+=add;
-                n=0;
-                pp[n++]=p;
-                i=0;
-                f=buf->data;
+                else {
+                        buf->data[offset-1] = '\0'; /* blat the '\n' */
+                        if (!(p = malloc(add + offset)))
+                                goto err;
+                        offset = 0;
+                }
+                pp = (char **)p;
+                p += add;
+                n = 0;
+                pp[n++] = p;
+                i = 0;
+                f = buf->data;
 
-                esc=0;
-                for (;;)
-                        {
-                        if (*f == '\0') break;
-                        if (*f == '\t')
-                                {
+                esc = 0;
+                for (;;) {
+                        if (*f == '\0')
+                                break;
+                        if (*f == '\t') {
                                 if (esc)
                                         p--;
-                                else
-                                        {       
+                                else {
                                         *(p++)='\0';
                                         f++;
-                                        if (n >=  num) break;
-                                        pp[n++]=p;
+                                        if (n >= num)
+                                                break;
+                                        pp[n++] = p;
                                         continue;
-                                        }
                                 }
+                        }
                         esc=(*f == '\\');
                         *(p++)= *(f++);
-                        }
+                }
                 *(p++)='\0';
-                if ((n != num) || (*f != '\0'))
-                        {
+                if ((n != num) || (*f != '\0')) {
 #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)   /* temporary fix :-( */
-                        fprintf(stderr,"wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
+                        fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
 #endif
-                        er=2;
+                        er = 2;
                         goto err;
-                        }
-                pp[n]=p;
-                if (!sk_OPENSSL_PSTRING_push(ret->data,pp))
-                        {
+                }
+                pp[n] = p;
+                if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {
 #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)   /* temporary fix :-( */
-                        fprintf(stderr,"failure in sk_push\n");
+                        fprintf(stderr, "failure in sk_push\n");
 #endif
-                        er=2;
+                        er = 2;
                         goto err;
-                        }
                 }
-        er=0;
+        }
+        er = 0;
+
 err:
         BUF_MEM_free(buf);
-        if (er)
-                {
+        if (er) {
 #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
-                if (er == 1) fprintf(stderr,"malloc failure\n");
+                if (er == 1)
+                        fprintf(stderr, "malloc failure\n");
 #endif
-                if (ret != NULL)
-                        {
-                        if (ret->data != NULL) sk_OPENSSL_PSTRING_free(ret->data);
-                        if (ret->index != NULL) free(ret->index);
-                        if (ret->qual != NULL) free(ret->qual);
-                        if (ret != NULL) free(ret);
-                        }
-                return(NULL);
+                if (ret != NULL) {
+                        if (ret->data != NULL)
+                                sk_OPENSSL_PSTRING_free(ret->data);
+                        if (ret->index != NULL)
+                                free(ret->index);
+                        if (ret->qual != NULL)
+                                free(ret->qual);
+                        if (ret != NULL)
+                                free(ret);
                 }
-        else
-                return(ret);
-        }
+                return (NULL);
+        } else
+                return (ret);
+}
 
-OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value)
-        {
+OPENSSL_STRING *
+TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value)
+{
         OPENSSL_STRING *ret;
         LHASH_OF(OPENSSL_STRING) *lh;
 
-        if (idx >= db->num_fields)
-                {
-                db->error=DB_ERROR_INDEX_OUT_OF_RANGE;
-                return(NULL);
-                }
-        lh=db->index[idx];
-        if (lh == NULL)
-                {
-                db->error=DB_ERROR_NO_INDEX;
-                return(NULL);
-                }
-        ret=lh_OPENSSL_STRING_retrieve(lh,value);
-        db->error=DB_ERROR_OK;
-        return(ret);
+        if (idx >= db->num_fields) {
+                db->error = DB_ERROR_INDEX_OUT_OF_RANGE;
+                return (NULL);
+        }
+        lh = db->index[idx];
+        if (lh == NULL) {
+                db->error = DB_ERROR_NO_INDEX;
+                return (NULL);
         }
+        ret = lh_OPENSSL_STRING_retrieve(lh, value);
+        db->error = DB_ERROR_OK;
+        return (ret);
+}
 
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
-                        LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp)
-        {
+int
+TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
+    LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp)
+{
         LHASH_OF(OPENSSL_STRING) *idx;
         OPENSSL_STRING *r;
-        int i,n;
+        int i, n;
 
-        if (field >= db->num_fields)
-                {
-                db->error=DB_ERROR_INDEX_OUT_OF_RANGE;
-                return(0);
-                }
+        if (field >= db->num_fields) {
+                db->error = DB_ERROR_INDEX_OUT_OF_RANGE;
+                return (0);
+        }
         /* FIXME: we lose type checking at this point */
-        if ((idx=(LHASH_OF(OPENSSL_STRING) *)lh_new(hash,cmp)) == NULL)
-                {
-                db->error=DB_ERROR_MALLOC;
-                return(0);
-                }
-        n=sk_OPENSSL_PSTRING_num(db->data);
-        for (i=0; i<n; i++)
-                {
-                r=sk_OPENSSL_PSTRING_value(db->data,i);
-                if ((qual != NULL) && (qual(r) == 0)) continue;
-                if ((r=lh_OPENSSL_STRING_insert(idx,r)) != NULL)
-                        {
-                        db->error=DB_ERROR_INDEX_CLASH;
-                        db->arg1=sk_OPENSSL_PSTRING_find(db->data,r);
-                        db->arg2=i;
+        if ((idx = (LHASH_OF(OPENSSL_STRING) *)lh_new(hash, cmp)) == NULL) {
+                db->error = DB_ERROR_MALLOC;
+                return (0);
+        }
+        n = sk_OPENSSL_PSTRING_num(db->data);
+        for (i = 0; i < n; i++) {
+                r = sk_OPENSSL_PSTRING_value(db->data, i);
+                if ((qual != NULL) && (qual(r) == 0))
+                        continue;
+                if ((r = lh_OPENSSL_STRING_insert(idx, r)) != NULL) {
+                        db->error = DB_ERROR_INDEX_CLASH;
+                        db->arg1 = sk_OPENSSL_PSTRING_find(db->data, r);
+                        db->arg2 = i;
                         lh_OPENSSL_STRING_free(idx);
-                        return(0);
-                        }
+                        return (0);
                 }
-        if (db->index[field] != NULL) lh_OPENSSL_STRING_free(db->index[field]);
-        db->index[field]=idx;
-        db->qual[field]=qual;
-        return(1);
         }
+        if (db->index[field] != NULL)
+                lh_OPENSSL_STRING_free(db->index[field]);
+        db->index[field] = idx;
+        db->qual[field] = qual;
+        return (1);
+}
 
-long TXT_DB_write(BIO *out, TXT_DB *db)
-        {
-        long i,j,n,nn,l,tot=0;
-        char *p,**pp,*f;
-        BUF_MEM *buf=NULL;
-        long ret= -1;
+long
+TXT_DB_write(BIO *out, TXT_DB *db)
+{
+        long i, j,n, nn, l, tot = 0;
+        char *p, **pp, *f;
+        BUF_MEM *buf = NULL;
+        long ret = -1;
 
-        if ((buf=BUF_MEM_new()) == NULL)
+        if ((buf = BUF_MEM_new()) == NULL)
                 goto err;
-        n=sk_OPENSSL_PSTRING_num(db->data);
-        nn=db->num_fields;
-        for (i=0; i<n; i++)
-                {
-                pp=sk_OPENSSL_PSTRING_value(db->data,i);
+        n = sk_OPENSSL_PSTRING_num(db->data);
+        nn = db->num_fields;
+        for (i = 0; i < n; i++) {
+                pp = sk_OPENSSL_PSTRING_value(db->data, i);
 
-                l=0;
-                for (j=0; j<nn; j++)
-                        {
+                l = 0;
+                for (j = 0; j < nn; j++) {
                         if (pp[j] != NULL)
-                                l+=strlen(pp[j]);
-                        }
-                if (!BUF_MEM_grow_clean(buf,(int)(l*2+nn))) goto err;
+                                l += strlen(pp[j]);
+                }
+                if (!BUF_MEM_grow_clean(buf, (int)(l*2 + nn)))
+                        goto err;
 
-                p=buf->data;
-                for (j=0; j<nn; j++)
-                        {
-                        f=pp[j];
+                p = buf->data;
+                for (j = 0; j < nn; j++) {
+                        f = pp[j];
                         if (f != NULL)
-                                for (;;) 
-                                        {
-                                        if (*f == '\0') break;
-                                        if (*f == '\t') *(p++)='\\';
-                                        *(p++)= *(f++);
-                                        }
-                        *(p++)='\t';
-                        }
-                p[-1]='\n';
-                j=p-buf->data;
-                if (BIO_write(out,buf->data,(int)j) != j)
-                        goto err;
-                tot+=j;
+                                for (;;) {
+                                        if (*f == '\0')
+                                                break;
+                                        if (*f == '\t')
+                                                *(p++) = '\\';
+                                        *(p++) = *(f++);
+                                }
+                        *(p++) = '\t';
                 }
-        ret=tot;
-err:
-        if (buf != NULL) BUF_MEM_free(buf);
-        return(ret);
+                p[-1] = '\n';
+                j = p - buf->data;
+                if (BIO_write(out, buf->data, (int)j) != j)
+                        goto err;
+                tot += j;
         }
+        ret = tot;
 
-int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
-        {
+err:
+        if (buf != NULL)
+                BUF_MEM_free(buf);
+        return (ret);
+}
+
+int
+TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
+{
         int i;
         OPENSSL_STRING *r;
 
-        for (i=0; i<db->num_fields; i++)
-                {
-                if (db->index[i] != NULL)
-                        {
-                        if ((db->qual[i] != NULL) &&
-                                (db->qual[i](row) == 0)) continue;
-                        r=lh_OPENSSL_STRING_retrieve(db->index[i],row);
-                        if (r != NULL)
-                                {
-                                db->error=DB_ERROR_INDEX_CLASH;
-                                db->arg1=i;
-                                db->arg_row=r;
+        for (i = 0; i < db->num_fields; i++) {
+                if (db->index[i] != NULL) {
+                        if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
+                                continue;
+                        r = lh_OPENSSL_STRING_retrieve(db->index[i], row);
+                        if (r != NULL) {
+                                db->error = DB_ERROR_INDEX_CLASH;
+                                db->arg1 = i;
+                                db->arg_row = r;
                                 goto err;
-                                }
                         }
                 }
+        }
         /* We have passed the index checks, now just append and insert */
-        if (!sk_OPENSSL_PSTRING_push(db->data,row))
-                {
-                db->error=DB_ERROR_MALLOC;
+        if (!sk_OPENSSL_PSTRING_push(db->data, row)) {
+                db->error = DB_ERROR_MALLOC;
                 goto err;
-                }
+        }
 
-        for (i=0; i<db->num_fields; i++)
-                {
-                if (db->index[i] != NULL)
-                        {
-                        if ((db->qual[i] != NULL) &&
-                                (db->qual[i](row) == 0)) continue;
-                        (void)lh_OPENSSL_STRING_insert(db->index[i],row);
-                        }
+        for (i = 0; i < db->num_fields; i++) {
+                if (db->index[i] != NULL) {
+                        if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
+                                continue;
+                        (void)lh_OPENSSL_STRING_insert(db->index[i], row);
                 }
-        return(1);
-err:
-        return(0);
         }
+        return (1);
+
+err:
+        return (0);
+}
 
-void TXT_DB_free(TXT_DB *db)
-        {
-        int i,n;
-        char **p,*max;
+void
+TXT_DB_free(TXT_DB *db)
+{
+        int i, n;
+        char **p, *max;
 
-        if(db == NULL)
-            return;
+        if (db == NULL)
+                return;
 
-        if (db->index != NULL)
-                {
-                for (i=db->num_fields-1; i>=0; i--)
-                        if (db->index[i] != NULL) lh_OPENSSL_STRING_free(db->index[i]);
+        if (db->index != NULL) {
+                for (i = db->num_fields - 1; i >= 0; i--)
+                        if (db->index[i] != NULL)
+                                lh_OPENSSL_STRING_free(db->index[i]);
                 free(db->index);
-                }
+        }
         if (db->qual != NULL)
                 free(db->qual);
-        if (db->data != NULL)
-                {
-                for (i=sk_OPENSSL_PSTRING_num(db->data)-1; i>=0; i--)
-                        {
+        if (db->data != NULL) {
+                for (i = sk_OPENSSL_PSTRING_num(db->data) - 1; i >= 0; i--) {
                         /* check if any 'fields' have been allocated
                          * from outside of the initial block */
-                        p=sk_OPENSSL_PSTRING_value(db->data,i);
-                        max=p[db->num_fields]; /* last address */
+                        p = sk_OPENSSL_PSTRING_value(db->data, i);
+                        max = p[db->num_fields]; /* last address */
                         if (max == NULL) /* new row */
-                                {
-                                for (n=0; n<db->num_fields; n++)
-                                        if (p[n] != NULL) free(p[n]);
-                                }
-                        else
-                                {
-                                for (n=0; n<db->num_fields; n++)
-                                        {
-                                        if (((p[n] < (char *)p) || (p[n] > max))
-                                                && (p[n] != NULL))
+                        {
+                                for (n = 0; n < db->num_fields; n++)
+                                        if (p[n] != NULL)
+                                                free(p[n]);
+                        } else {
+                                for (n = 0; n < db->num_fields; n++) {
+                                        if (((p[n] < (char *)p) ||
+                                            (p[n] > max)) &&
+                                            (p[n] != NULL))
                                                 free(p[n]);
-                                        }
                                 }
-                        free(sk_OPENSSL_PSTRING_value(db->data,i));
                         }
-                sk_OPENSSL_PSTRING_free(db->data);
+                        free(sk_OPENSSL_PSTRING_value(db->data, i));
                 }
-        free(db);
+                sk_OPENSSL_PSTRING_free(db->data);
         }
+        free(db);
+}
diff --git a/src/lib/libcrypto/txt_db/txt_db.h b/src/lib/libcrypto/txt_db/txt_db.h
index 6abe435bc8..5155400e56 100644
--- a/src/lib/libcrypto/txt_db/txt_db.h
+++ b/src/lib/libcrypto/txt_db/txt_db.h
@@ -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
@@ -80,8 +80,7 @@ extern "C" {
 typedef OPENSSL_STRING *OPENSSL_PSTRING;
 DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
 
-typedef struct txt_db_st
-        {
+typedef struct txt_db_st {
         int num_fields;
         STACK_OF(OPENSSL_PSTRING) *data;
         LHASH_OF(OPENSSL_STRING) **index;
@@ -90,7 +89,7 @@ typedef struct txt_db_st
         long arg1;
         long arg2;
         OPENSSL_STRING *arg_row;
-        } TXT_DB;
+} TXT_DB;
 
 #ifndef OPENSSL_NO_BIO
 TXT_DB *TXT_DB_read(BIO *in, int num);
@@ -99,8 +98,8 @@ long TXT_DB_write(BIO *out, TXT_DB *db);
 TXT_DB *TXT_DB_read(char *in, int num);
 long TXT_DB_write(char *out, TXT_DB *db);
 #endif
-int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(OPENSSL_STRING *),
-                        LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
+int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
+    LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
 void TXT_DB_free(TXT_DB *db);
 OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value);
 int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);
diff --git a/src/lib/libssl/src/crypto/txt_db/txt_db.c b/src/lib/libssl/src/crypto/txt_db/txt_db.c
index c1e7a79a1a..69fd2ba5bf 100644
--- a/src/lib/libssl/src/crypto/txt_db/txt_db.c
+++ b/src/lib/libssl/src/crypto/txt_db/txt_db.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
@@ -66,323 +66,320 @@
 #undef BUFSIZE
 #define BUFSIZE 512
 
-const char TXT_DB_version[]="TXT_DB" OPENSSL_VERSION_PTEXT;
+const char TXT_DB_version[] = "TXT_DB" OPENSSL_VERSION_PTEXT;
 
-TXT_DB *TXT_DB_read(BIO *in, int num)
-        {
-        TXT_DB *ret=NULL;
-        int er=1;
-        int esc=0;
-        long ln=0;
-        int i,add,n;
-        int size=BUFSIZE;
-        int offset=0;
-        char *p,*f;
+TXT_DB *
+TXT_DB_read(BIO *in, int num)
+{
+        TXT_DB *ret = NULL;
+        int er = 1;
+        int esc = 0;
+        long ln = 0;
+        int i, add, n;
+        int size = BUFSIZE;
+        int offset = 0;
+        char *p, *f;
         OPENSSL_STRING *pp;
-        BUF_MEM *buf=NULL;
+        BUF_MEM *buf = NULL;
 
-        if ((buf=BUF_MEM_new()) == NULL) goto err;
-        if (!BUF_MEM_grow(buf,size)) goto err;
+        if ((buf = BUF_MEM_new()) == NULL)
+                goto err;
+        if (!BUF_MEM_grow(buf, size))
+                goto err;
 
-        if ((ret=malloc(sizeof(TXT_DB))) == NULL)
+        if ((ret = malloc(sizeof(TXT_DB))) == NULL)
                 goto err;
-        ret->num_fields=num;
-        ret->index=NULL;
-        ret->qual=NULL;
-        if ((ret->data=sk_OPENSSL_PSTRING_new_null()) == NULL)
+        ret->num_fields = num;
+        ret->index = NULL;
+        ret->qual = NULL;
+        if ((ret->data = sk_OPENSSL_PSTRING_new_null()) == NULL)
                 goto err;
-        if ((ret->index=malloc(sizeof(*ret->index)*num)) == NULL)
+        if ((ret->index = malloc(sizeof(*ret->index)*num)) == NULL)
                 goto err;
-        if ((ret->qual=malloc(sizeof(*(ret->qual))*num)) == NULL)
+        if ((ret->qual = malloc(sizeof(*(ret->qual))*num)) == NULL)
                 goto err;
-        for (i=0; i<num; i++)
-                {
-                ret->index[i]=NULL;
-                ret->qual[i]=NULL;
-                }
+        for (i = 0; i < num; i++) {
+                ret->index[i] = NULL;
+                ret->qual[i] = NULL;
+        }
 
-        add=(num+1)*sizeof(char *);
-        buf->data[size-1]='\0';
-        offset=0;
-        for (;;)
-                {
-                if (offset != 0)
-                        {
-                        size+=BUFSIZE;
-                        if (!BUF_MEM_grow_clean(buf,size)) goto err;
-                        }
-                buf->data[offset]='\0';
-                BIO_gets(in,&(buf->data[offset]),size-offset);
+        add = (num + 1)*sizeof(char *);
+        buf->data[size-1] = '\0';
+        offset = 0;
+        for (;;) {
+                if (offset != 0) {
+                        size += BUFSIZE;
+                        if (!BUF_MEM_grow_clean(buf, size))
+                                goto err;
+                }
+                buf->data[offset] = '\0';
+                BIO_gets(in, &(buf->data[offset]), size - offset);
                 ln++;
-                if (buf->data[offset] == '\0') break;
-                if ((offset == 0) && (buf->data[0] == '#')) continue;
-                i=strlen(&(buf->data[offset]));
-                offset+=i;
+                if (buf->data[offset] == '\0')
+                        break;
+                if ((offset == 0) && (buf->data[0] == '#'))
+                        continue;
+                i = strlen(&(buf->data[offset]));
+                offset += i;
                 if (buf->data[offset-1] != '\n')
                         continue;
-                else
-                        {
-                        buf->data[offset-1]='\0'; /* blat the '\n' */
-                        if (!(p=malloc(add+offset))) goto err;
-                        offset=0;
-                        }
-                pp=(char **)p;
-                p+=add;
-                n=0;
-                pp[n++]=p;
-                i=0;
-                f=buf->data;
+                else {
+                        buf->data[offset-1] = '\0'; /* blat the '\n' */
+                        if (!(p = malloc(add + offset)))
+                                goto err;
+                        offset = 0;
+                }
+                pp = (char **)p;
+                p += add;
+                n = 0;
+                pp[n++] = p;
+                i = 0;
+                f = buf->data;
 
-                esc=0;
-                for (;;)
-                        {
-                        if (*f == '\0') break;
-                        if (*f == '\t')
-                                {
+                esc = 0;
+                for (;;) {
+                        if (*f == '\0')
+                                break;
+                        if (*f == '\t') {
                                 if (esc)
                                         p--;
-                                else
-                                        {       
+                                else {
                                         *(p++)='\0';
                                         f++;
-                                        if (n >=  num) break;
-                                        pp[n++]=p;
+                                        if (n >= num)
+                                                break;
+                                        pp[n++] = p;
                                         continue;
-                                        }
                                 }
+                        }
                         esc=(*f == '\\');
                         *(p++)= *(f++);
-                        }
+                }
                 *(p++)='\0';
-                if ((n != num) || (*f != '\0'))
-                        {
+                if ((n != num) || (*f != '\0')) {
 #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)   /* temporary fix :-( */
-                        fprintf(stderr,"wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
+                        fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
 #endif
-                        er=2;
+                        er = 2;
                         goto err;
-                        }
-                pp[n]=p;
-                if (!sk_OPENSSL_PSTRING_push(ret->data,pp))
-                        {
+                }
+                pp[n] = p;
+                if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {
 #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)   /* temporary fix :-( */
-                        fprintf(stderr,"failure in sk_push\n");
+                        fprintf(stderr, "failure in sk_push\n");
 #endif
-                        er=2;
+                        er = 2;
                         goto err;
-                        }
                 }
-        er=0;
+        }
+        er = 0;
+
 err:
         BUF_MEM_free(buf);
-        if (er)
-                {
+        if (er) {
 #if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
-                if (er == 1) fprintf(stderr,"malloc failure\n");
+                if (er == 1)
+                        fprintf(stderr, "malloc failure\n");
 #endif
-                if (ret != NULL)
-                        {
-                        if (ret->data != NULL) sk_OPENSSL_PSTRING_free(ret->data);
-                        if (ret->index != NULL) free(ret->index);
-                        if (ret->qual != NULL) free(ret->qual);
-                        if (ret != NULL) free(ret);
-                        }
-                return(NULL);
+                if (ret != NULL) {
+                        if (ret->data != NULL)
+                                sk_OPENSSL_PSTRING_free(ret->data);
+                        if (ret->index != NULL)
+                                free(ret->index);
+                        if (ret->qual != NULL)
+                                free(ret->qual);
+                        if (ret != NULL)
+                                free(ret);
                 }
-        else
-                return(ret);
-        }
+                return (NULL);
+        } else
+                return (ret);
+}
 
-OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value)
-        {
+OPENSSL_STRING *
+TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value)
+{
         OPENSSL_STRING *ret;
         LHASH_OF(OPENSSL_STRING) *lh;
 
-        if (idx >= db->num_fields)
-                {
-                db->error=DB_ERROR_INDEX_OUT_OF_RANGE;
-                return(NULL);
-                }
-        lh=db->index[idx];
-        if (lh == NULL)
-                {
-                db->error=DB_ERROR_NO_INDEX;
-                return(NULL);
-                }
-        ret=lh_OPENSSL_STRING_retrieve(lh,value);
-        db->error=DB_ERROR_OK;
-        return(ret);
+        if (idx >= db->num_fields) {
+                db->error = DB_ERROR_INDEX_OUT_OF_RANGE;
+                return (NULL);
+        }
+        lh = db->index[idx];
+        if (lh == NULL) {
+                db->error = DB_ERROR_NO_INDEX;
+                return (NULL);
         }
+        ret = lh_OPENSSL_STRING_retrieve(lh, value);
+        db->error = DB_ERROR_OK;
+        return (ret);
+}
 
-int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
-                        LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp)
-        {
+int
+TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
+    LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp)
+{
         LHASH_OF(OPENSSL_STRING) *idx;
         OPENSSL_STRING *r;
-        int i,n;
+        int i, n;
 
-        if (field >= db->num_fields)
-                {
-                db->error=DB_ERROR_INDEX_OUT_OF_RANGE;
-                return(0);
-                }
+        if (field >= db->num_fields) {
+                db->error = DB_ERROR_INDEX_OUT_OF_RANGE;
+                return (0);
+        }
         /* FIXME: we lose type checking at this point */
-        if ((idx=(LHASH_OF(OPENSSL_STRING) *)lh_new(hash,cmp)) == NULL)
-                {
-                db->error=DB_ERROR_MALLOC;
-                return(0);
-                }
-        n=sk_OPENSSL_PSTRING_num(db->data);
-        for (i=0; i<n; i++)
-                {
-                r=sk_OPENSSL_PSTRING_value(db->data,i);
-                if ((qual != NULL) && (qual(r) == 0)) continue;
-                if ((r=lh_OPENSSL_STRING_insert(idx,r)) != NULL)
-                        {
-                        db->error=DB_ERROR_INDEX_CLASH;
-                        db->arg1=sk_OPENSSL_PSTRING_find(db->data,r);
-                        db->arg2=i;
+        if ((idx = (LHASH_OF(OPENSSL_STRING) *)lh_new(hash, cmp)) == NULL) {
+                db->error = DB_ERROR_MALLOC;
+                return (0);
+        }
+        n = sk_OPENSSL_PSTRING_num(db->data);
+        for (i = 0; i < n; i++) {
+                r = sk_OPENSSL_PSTRING_value(db->data, i);
+                if ((qual != NULL) && (qual(r) == 0))
+                        continue;
+                if ((r = lh_OPENSSL_STRING_insert(idx, r)) != NULL) {
+                        db->error = DB_ERROR_INDEX_CLASH;
+                        db->arg1 = sk_OPENSSL_PSTRING_find(db->data, r);
+                        db->arg2 = i;
                         lh_OPENSSL_STRING_free(idx);
-                        return(0);
-                        }
+                        return (0);
                 }
-        if (db->index[field] != NULL) lh_OPENSSL_STRING_free(db->index[field]);
-        db->index[field]=idx;
-        db->qual[field]=qual;
-        return(1);
         }
+        if (db->index[field] != NULL)
+                lh_OPENSSL_STRING_free(db->index[field]);
+        db->index[field] = idx;
+        db->qual[field] = qual;
+        return (1);
+}
 
-long TXT_DB_write(BIO *out, TXT_DB *db)
-        {
-        long i,j,n,nn,l,tot=0;
-        char *p,**pp,*f;
-        BUF_MEM *buf=NULL;
-        long ret= -1;
+long
+TXT_DB_write(BIO *out, TXT_DB *db)
+{
+        long i, j,n, nn, l, tot = 0;
+        char *p, **pp, *f;
+        BUF_MEM *buf = NULL;
+        long ret = -1;
 
-        if ((buf=BUF_MEM_new()) == NULL)
+        if ((buf = BUF_MEM_new()) == NULL)
                 goto err;
-        n=sk_OPENSSL_PSTRING_num(db->data);
-        nn=db->num_fields;
-        for (i=0; i<n; i++)
-                {
-                pp=sk_OPENSSL_PSTRING_value(db->data,i);
+        n = sk_OPENSSL_PSTRING_num(db->data);
+        nn = db->num_fields;
+        for (i = 0; i < n; i++) {
+                pp = sk_OPENSSL_PSTRING_value(db->data, i);
 
-                l=0;
-                for (j=0; j<nn; j++)
-                        {
+                l = 0;
+                for (j = 0; j < nn; j++) {
                         if (pp[j] != NULL)
-                                l+=strlen(pp[j]);
-                        }
-                if (!BUF_MEM_grow_clean(buf,(int)(l*2+nn))) goto err;
+                                l += strlen(pp[j]);
+                }
+                if (!BUF_MEM_grow_clean(buf, (int)(l*2 + nn)))
+                        goto err;
 
-                p=buf->data;
-                for (j=0; j<nn; j++)
-                        {
-                        f=pp[j];
+                p = buf->data;
+                for (j = 0; j < nn; j++) {
+                        f = pp[j];
                         if (f != NULL)
-                                for (;;) 
-                                        {
-                                        if (*f == '\0') break;
-                                        if (*f == '\t') *(p++)='\\';
-                                        *(p++)= *(f++);
-                                        }
-                        *(p++)='\t';
-                        }
-                p[-1]='\n';
-                j=p-buf->data;
-                if (BIO_write(out,buf->data,(int)j) != j)
-                        goto err;
-                tot+=j;
+                                for (;;) {
+                                        if (*f == '\0')
+                                                break;
+                                        if (*f == '\t')
+                                                *(p++) = '\\';
+                                        *(p++) = *(f++);
+                                }
+                        *(p++) = '\t';
                 }
-        ret=tot;
-err:
-        if (buf != NULL) BUF_MEM_free(buf);
-        return(ret);
+                p[-1] = '\n';
+                j = p - buf->data;
+                if (BIO_write(out, buf->data, (int)j) != j)
+                        goto err;
+                tot += j;
         }
+        ret = tot;
 
-int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
-        {
+err:
+        if (buf != NULL)
+                BUF_MEM_free(buf);
+        return (ret);
+}
+
+int
+TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *row)
+{
         int i;
         OPENSSL_STRING *r;
 
-        for (i=0; i<db->num_fields; i++)
-                {
-                if (db->index[i] != NULL)
-                        {
-                        if ((db->qual[i] != NULL) &&
-                                (db->qual[i](row) == 0)) continue;
-                        r=lh_OPENSSL_STRING_retrieve(db->index[i],row);
-                        if (r != NULL)
-                                {
-                                db->error=DB_ERROR_INDEX_CLASH;
-                                db->arg1=i;
-                                db->arg_row=r;
+        for (i = 0; i < db->num_fields; i++) {
+                if (db->index[i] != NULL) {
+                        if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
+                                continue;
+                        r = lh_OPENSSL_STRING_retrieve(db->index[i], row);
+                        if (r != NULL) {
+                                db->error = DB_ERROR_INDEX_CLASH;
+                                db->arg1 = i;
+                                db->arg_row = r;
                                 goto err;
-                                }
                         }
                 }
+        }
         /* We have passed the index checks, now just append and insert */
-        if (!sk_OPENSSL_PSTRING_push(db->data,row))
-                {
-                db->error=DB_ERROR_MALLOC;
+        if (!sk_OPENSSL_PSTRING_push(db->data, row)) {
+                db->error = DB_ERROR_MALLOC;
                 goto err;
-                }
+        }
 
-        for (i=0; i<db->num_fields; i++)
-                {
-                if (db->index[i] != NULL)
-                        {
-                        if ((db->qual[i] != NULL) &&
-                                (db->qual[i](row) == 0)) continue;
-                        (void)lh_OPENSSL_STRING_insert(db->index[i],row);
-                        }
+        for (i = 0; i < db->num_fields; i++) {
+                if (db->index[i] != NULL) {
+                        if ((db->qual[i] != NULL) && (db->qual[i](row) == 0))
+                                continue;
+                        (void)lh_OPENSSL_STRING_insert(db->index[i], row);
                 }
-        return(1);
-err:
-        return(0);
         }
+        return (1);
+
+err:
+        return (0);
+}
 
-void TXT_DB_free(TXT_DB *db)
-        {
-        int i,n;
-        char **p,*max;
+void
+TXT_DB_free(TXT_DB *db)
+{
+        int i, n;
+        char **p, *max;
 
-        if(db == NULL)
-            return;
+        if (db == NULL)
+                return;
 
-        if (db->index != NULL)
-                {
-                for (i=db->num_fields-1; i>=0; i--)
-                        if (db->index[i] != NULL) lh_OPENSSL_STRING_free(db->index[i]);
+        if (db->index != NULL) {
+                for (i = db->num_fields - 1; i >= 0; i--)
+                        if (db->index[i] != NULL)
+                                lh_OPENSSL_STRING_free(db->index[i]);
                 free(db->index);
-                }
+        }
         if (db->qual != NULL)
                 free(db->qual);
-        if (db->data != NULL)
-                {
-                for (i=sk_OPENSSL_PSTRING_num(db->data)-1; i>=0; i--)
-                        {
+        if (db->data != NULL) {
+                for (i = sk_OPENSSL_PSTRING_num(db->data) - 1; i >= 0; i--) {
                         /* check if any 'fields' have been allocated
                          * from outside of the initial block */
-                        p=sk_OPENSSL_PSTRING_value(db->data,i);
-                        max=p[db->num_fields]; /* last address */
+                        p = sk_OPENSSL_PSTRING_value(db->data, i);
+                        max = p[db->num_fields]; /* last address */
                         if (max == NULL) /* new row */
-                                {
-                                for (n=0; n<db->num_fields; n++)
-                                        if (p[n] != NULL) free(p[n]);
-                                }
-                        else
-                                {
-                                for (n=0; n<db->num_fields; n++)
-                                        {
-                                        if (((p[n] < (char *)p) || (p[n] > max))
-                                                && (p[n] != NULL))
+                        {
+                                for (n = 0; n < db->num_fields; n++)
+                                        if (p[n] != NULL)
+                                                free(p[n]);
+                        } else {
+                                for (n = 0; n < db->num_fields; n++) {
+                                        if (((p[n] < (char *)p) ||
+                                            (p[n] > max)) &&
+                                            (p[n] != NULL))
                                                 free(p[n]);
-                                        }
                                 }
-                        free(sk_OPENSSL_PSTRING_value(db->data,i));
                         }
-                sk_OPENSSL_PSTRING_free(db->data);
+                        free(sk_OPENSSL_PSTRING_value(db->data, i));
                 }
-        free(db);
+                sk_OPENSSL_PSTRING_free(db->data);
         }
+        free(db);
+}
diff --git a/src/lib/libssl/src/crypto/txt_db/txt_db.h b/src/lib/libssl/src/crypto/txt_db/txt_db.h
index 6abe435bc8..5155400e56 100644
--- a/src/lib/libssl/src/crypto/txt_db/txt_db.h
+++ b/src/lib/libssl/src/crypto/txt_db/txt_db.h
@@ -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
@@ -80,8 +80,7 @@ extern "C" {
 typedef OPENSSL_STRING *OPENSSL_PSTRING;
 DECLARE_SPECIAL_STACK_OF(OPENSSL_PSTRING, OPENSSL_STRING)
 
-typedef struct txt_db_st
-        {
+typedef struct txt_db_st {
         int num_fields;
         STACK_OF(OPENSSL_PSTRING) *data;
         LHASH_OF(OPENSSL_STRING) **index;
@@ -90,7 +89,7 @@ typedef struct txt_db_st
         long arg1;
         long arg2;
         OPENSSL_STRING *arg_row;
-        } TXT_DB;
+} TXT_DB;
 
 #ifndef OPENSSL_NO_BIO
 TXT_DB *TXT_DB_read(BIO *in, int num);
@@ -99,8 +98,8 @@ long TXT_DB_write(BIO *out, TXT_DB *db);
 TXT_DB *TXT_DB_read(char *in, int num);
 long TXT_DB_write(char *out, TXT_DB *db);
 #endif
-int TXT_DB_create_index(TXT_DB *db,int field,int (*qual)(OPENSSL_STRING *),
-                        LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
+int TXT_DB_create_index(TXT_DB *db, int field, int (*qual)(OPENSSL_STRING *),
+    LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE cmp);
 void TXT_DB_free(TXT_DB *db);
 OPENSSL_STRING *TXT_DB_get_by_index(TXT_DB *db, int idx, OPENSSL_STRING *value);
 int TXT_DB_insert(TXT_DB *db, OPENSSL_STRING *value);