1 files changed, 63 insertions, 65 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_saos.c b/src/lib/libcrypto/rsa/rsa_saos.c
index cca503e026..50dfef7e71 100644
--- a/src/lib/libcrypto/rsa/rsa_saos.c
+++ b/src/lib/libcrypto/rsa/rsa_saos.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_saos.c,v 1.11 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rsa_saos.c,v 1.12 2014/07/09 08:20:08 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,88 +63,86 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
-int RSA_sign_ASN1_OCTET_STRING(int type,
-        const unsigned char *m, unsigned int m_len,
-        unsigned char *sigret, unsigned int *siglen, RSA *rsa)
-        {
+int
+RSA_sign_ASN1_OCTET_STRING(int type, const unsigned char *m, unsigned int m_len,
+    unsigned char *sigret, unsigned int *siglen, RSA *rsa)
+{
         ASN1_OCTET_STRING sig;
-        int i,j,ret=1;
+        int i, j, ret = 1;
         unsigned char *p,*s;
 
-        sig.type=V_ASN1_OCTET_STRING;
-        sig.length=m_len;
-        sig.data=(unsigned char *)m;
+        sig.type = V_ASN1_OCTET_STRING;
+        sig.length = m_len;
+        sig.data = (unsigned char *)m;
 
-        i=i2d_ASN1_OCTET_STRING(&sig,NULL);
-        j=RSA_size(rsa);
-        if (i > (j-RSA_PKCS1_PADDING_SIZE))
-                {
-                RSAerr(RSA_F_RSA_SIGN_ASN1_OCTET_STRING,RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY);
-                return(0);
-                }
-        s = malloc((unsigned int)j+1);
-        if (s == NULL)
-                {
-                RSAerr(RSA_F_RSA_SIGN_ASN1_OCTET_STRING,ERR_R_MALLOC_FAILURE);
-                return(0);
-                }
-        p=s;
-        i2d_ASN1_OCTET_STRING(&sig,&p);
-        i=RSA_private_encrypt(i,s,sigret,rsa,RSA_PKCS1_PADDING);
+        i = i2d_ASN1_OCTET_STRING(&sig, NULL);
+        j = RSA_size(rsa);
+        if (i > (j - RSA_PKCS1_PADDING_SIZE)) {
+                RSAerr(RSA_F_RSA_SIGN_ASN1_OCTET_STRING,
+                    RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY);
+                return 0;
+        }
+        s = malloc((unsigned int)j + 1);
+        if (s == NULL) {
+                RSAerr(RSA_F_RSA_SIGN_ASN1_OCTET_STRING, ERR_R_MALLOC_FAILURE);
+                return 0;
+        }
+        p = s;
+        i2d_ASN1_OCTET_STRING(&sig, &p);
+        i = RSA_private_encrypt(i, s, sigret, rsa, RSA_PKCS1_PADDING);
         if (i <= 0)
-                ret=0;
+                ret = 0;
         else
-                *siglen=i;
+                *siglen = i;
 
-        OPENSSL_cleanse(s,(unsigned int)j+1);
+        OPENSSL_cleanse(s, (unsigned int)j + 1);
         free(s);
-        return(ret);
-        }
+        return ret;
+}
 
-int RSA_verify_ASN1_OCTET_STRING(int dtype,
-        const unsigned char *m,
-        unsigned int m_len, unsigned char *sigbuf, unsigned int siglen,
-        RSA *rsa)
-        {
-        int i,ret=0;
+int
+RSA_verify_ASN1_OCTET_STRING(int dtype, const unsigned char *m,
+    unsigned int m_len, unsigned char *sigbuf, unsigned int siglen, RSA *rsa)
+{
+        int i, ret = 0;
         unsigned char *s;
         const unsigned char *p;
-        ASN1_OCTET_STRING *sig=NULL;
+        ASN1_OCTET_STRING *sig = NULL;
 
-        if (siglen != (unsigned int)RSA_size(rsa))
-                {
-                RSAerr(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,RSA_R_WRONG_SIGNATURE_LENGTH);
-                return(0);
-                }
+        if (siglen != (unsigned int)RSA_size(rsa)) {
+                RSAerr(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,
+                    RSA_R_WRONG_SIGNATURE_LENGTH);
+                return 0;
+        }
 
         s = malloc((unsigned int)siglen);
-        if (s == NULL)
-                {
-                RSAerr(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,ERR_R_MALLOC_FAILURE);
+        if (s == NULL) {
+                RSAerr(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,
+                    ERR_R_MALLOC_FAILURE);
                 goto err;
-                }
-        i=RSA_public_decrypt((int)siglen,sigbuf,s,rsa,RSA_PKCS1_PADDING);
+        }
+        i = RSA_public_decrypt((int)siglen, sigbuf, s, rsa, RSA_PKCS1_PADDING);
 
-        if (i <= 0) goto err;
+        if (i <= 0)
+                goto err;
 
-        p=s;
-        sig=d2i_ASN1_OCTET_STRING(NULL,&p,(long)i);
-        if (sig == NULL) goto err;
+        p = s;
+        sig = d2i_ASN1_OCTET_STRING(NULL, &p, (long)i);
+        if (sig == NULL)
+                goto err;
 
-        if (    ((unsigned int)sig->length != m_len) ||
-                (memcmp(m,sig->data,m_len) != 0))
-                {
-                RSAerr(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,RSA_R_BAD_SIGNATURE);
-                }
-        else
-                ret=1;
+        if ((unsigned int)sig->length != m_len ||
+            memcmp(m,sig->data, m_len) != 0) {
+                RSAerr(RSA_F_RSA_VERIFY_ASN1_OCTET_STRING,
+                    RSA_R_BAD_SIGNATURE);
+        } else
+                ret = 1;
 err:
-        if (sig != NULL) M_ASN1_OCTET_STRING_free(sig);
-        if (s != NULL)
-                {
-                OPENSSL_cleanse(s,(unsigned int)siglen);
+        if (sig != NULL)
+                M_ASN1_OCTET_STRING_free(sig);
+        if (s != NULL) {
+                OPENSSL_cleanse(s, (unsigned int)siglen);
                 free(s);
-                }
-        return(ret);
         }
-
+        return ret;
+}