putting most of the braces in the right column is the very least we can do.

1 files changed, 33 insertions, 33 deletions

diff --git a/src/lib/libcrypto/asn1/n_pkey.c b/src/lib/libcrypto/asn1/n_pkey.c
index 97647d17e1..a59640582e 100644
--- a/src/lib/libcrypto/asn1/n_pkey.c
+++ b/src/lib/libcrypto/asn1/n_pkey.c
@@ -70,21 +70,21 @@
 #ifndef OPENSSL_NO_RC4
 
 typedef struct netscape_pkey_st
-        {
+{
         long version;
         X509_ALGOR *algor;
         ASN1_OCTET_STRING *private_key;
-        } NETSCAPE_PKEY;
+} NETSCAPE_PKEY;
 
 typedef struct netscape_encrypted_pkey_st
-        {
+{
         ASN1_OCTET_STRING *os;
         /* This is the same structure as DigestInfo so use it:
          * although this isn't really anything to do with
          * digests.
          */
         X509_SIG *enckey;
-        } NETSCAPE_ENCRYPTED_PKEY;
+} NETSCAPE_ENCRYPTED_PKEY;
 
 
 ASN1_BROKEN_SEQUENCE(NETSCAPE_ENCRYPTED_PKEY) = {
@@ -121,7 +121,7 @@ int i2d_Netscape_RSA(const RSA *a, unsigned char **pp,
 int i2d_RSA_NET(const RSA *a, unsigned char **pp,
                 int (*cb)(char *buf, int len, const char *prompt, int verify),
                 int sgckey)
-        {
+{
         int i, j, ret = 0;
         int rsalen, pkeylen, olen;
         NETSCAPE_PKEY *pkey = NULL;
@@ -160,36 +160,36 @@ int i2d_RSA_NET(const RSA *a, unsigned char **pp,
         enckey->enckey->algor->parameter->type=V_ASN1_NULL;
 
         if (pp == NULL)
-                {
+        {
                 olen = i2d_NETSCAPE_ENCRYPTED_PKEY(enckey, NULL);
                 NETSCAPE_PKEY_free(pkey);
                 NETSCAPE_ENCRYPTED_PKEY_free(enckey);
                 return olen;
-                }
+        }
 
 
         /* Since its RC4 encrypted length is actual length */
         if ((zz=(unsigned char *)malloc(rsalen)) == NULL)
-                {
+        {
                 ASN1err(ASN1_F_I2D_RSA_NET,ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
         pkey->private_key->data = zz;
         /* Write out private key encoding */
         i2d_RSAPrivateKey(a,&zz);
 
         if ((zz=malloc(pkeylen)) == NULL)
-                {
+        {
                 ASN1err(ASN1_F_I2D_RSA_NET,ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
 
         if (!ASN1_STRING_set(enckey->os, "private-key", -1)) 
-                {
+        {
                 ASN1err(ASN1_F_I2D_RSA_NET,ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
+        }
         enckey->enckey->digest->data = zz;
         i2d_NETSCAPE_PKEY(pkey,&zz);
 
@@ -200,10 +200,10 @@ int i2d_RSA_NET(const RSA *a, unsigned char **pp,
                 cb=EVP_read_pw_string;
         i=cb((char *)buf,256,"Enter Private Key password:",1);
         if (i != 0)
-                {
+        {
                 ASN1err(ASN1_F_I2D_RSA_NET,ASN1_R_BAD_PASSWORD_READ);
                 goto err;
-                }
+        }
         i = strlen((char *)buf);
         /* If the key is used for SGC the algorithm is modified a little. */
         if(sgckey) {
@@ -211,7 +211,7 @@ int i2d_RSA_NET(const RSA *a, unsigned char **pp,
                         goto err;
                 memcpy(buf + 16, "SGCKEYSALT", 10);
                 i = 26;
-        }
+}
 
         if (!EVP_BytesToKey(EVP_rc4(),EVP_md5(),NULL,buf,i,1,key,NULL))
                 goto err;
@@ -232,7 +232,7 @@ err:
         NETSCAPE_ENCRYPTED_PKEY_free(enckey);
         NETSCAPE_PKEY_free(pkey);
         return(ret);
-        }
+}
 
 
 RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
@@ -245,7 +245,7 @@ RSA *d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length,
 RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
                  int (*cb)(char *buf, int len, const char *prompt, int verify),
                  int sgckey)
-        {
+{
         RSA *ret=NULL;
         const unsigned char *p;
         NETSCAPE_ENCRYPTED_PKEY *enckey = NULL;
@@ -256,20 +256,20 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
         if(!enckey) {
                 ASN1err(ASN1_F_D2I_RSA_NET,ASN1_R_DECODING_ERROR);
                 return NULL;
-        }
+}
 
         if ((enckey->os->length != 11) || (strncmp("private-key",
                 (char *)enckey->os->data,11) != 0))
-                {
+        {
                 ASN1err(ASN1_F_D2I_RSA_NET,ASN1_R_PRIVATE_KEY_HEADER_MISSING);
                 NETSCAPE_ENCRYPTED_PKEY_free(enckey);
                 return NULL;
-                }
+        }
         if (OBJ_obj2nid(enckey->enckey->algor->algorithm) != NID_rc4)
-                {
+        {
                 ASN1err(ASN1_F_D2I_RSA_NET,ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM);
                 goto err;
-        }
+}
         if (cb == NULL)
                 cb=EVP_read_pw_string;
         if ((ret=d2i_RSA_NET_2(a, enckey->enckey->digest,cb, sgckey)) == NULL) goto err;
@@ -280,12 +280,12 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned char **pp, long length,
         NETSCAPE_ENCRYPTED_PKEY_free(enckey);
         return ret;
 
-        }
+}
 
 static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,
                           int (*cb)(char *buf, int len, const char *prompt,
                                     int verify), int sgckey)
-        {
+{
         NETSCAPE_PKEY *pkey=NULL;
         RSA *ret=NULL;
         int i,j;
@@ -297,10 +297,10 @@ static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,
 
         i=cb((char *)buf,256,"Enter Private Key password:",0);
         if (i != 0)
-                {
+        {
                 ASN1err(ASN1_F_D2I_RSA_NET_2,ASN1_R_BAD_PASSWORD_READ);
                 goto err;
-                }
+        }
 
         i = strlen((char *)buf);
         if(sgckey){
@@ -308,7 +308,7 @@ static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,
                         goto err;
                 memcpy(buf + 16, "SGCKEYSALT", 10);
                 i = 26;
-        }
+}
                 
         if (!EVP_BytesToKey(EVP_rc4(),EVP_md5(),NULL,buf,i,1,key,NULL))
                 goto err;
@@ -325,22 +325,22 @@ static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os,
         zz=os->data;
 
         if ((pkey=d2i_NETSCAPE_PKEY(NULL,&zz,os->length)) == NULL)
-                {
+        {
                 ASN1err(ASN1_F_D2I_RSA_NET_2,ASN1_R_UNABLE_TO_DECODE_RSA_PRIVATE_KEY);
                 goto err;
-                }
+        }
                 
         zz=pkey->private_key->data;
         if ((ret=d2i_RSAPrivateKey(a,&zz,pkey->private_key->length)) == NULL)
-                {
+        {
                 ASN1err(ASN1_F_D2I_RSA_NET_2,ASN1_R_UNABLE_TO_DECODE_RSA_KEY);
                 goto err;
-                }
+        }
 err:
         EVP_CIPHER_CTX_cleanup(&ctx);
         NETSCAPE_PKEY_free(pkey);
         return(ret);
-        }
+}
 
 #endif /* OPENSSL_NO_RC4 */