1 files changed, 29 insertions, 30 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_none.c b/src/lib/libcrypto/rsa/rsa_none.c
index 1904c7c098..fde5eb6ef6 100644
--- a/src/lib/libcrypto/rsa/rsa_none.c
+++ b/src/lib/libcrypto/rsa/rsa_none.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_none.c,v 1.4 2014/06/12 15:49:30 deraadt Exp $ */
+/* $OpenBSD: rsa_none.c,v 1.5 2014/07/09 08:20:08 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -62,37 +62,36 @@
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
 
-int RSA_padding_add_none(unsigned char *to, int tlen,
-        const unsigned char *from, int flen)
-        {
-        if (flen > tlen)
-                {
-                RSAerr(RSA_F_RSA_PADDING_ADD_NONE,RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
-                return(0);
-                }
-
-        if (flen < tlen)
-                {
-                RSAerr(RSA_F_RSA_PADDING_ADD_NONE,RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE);
-                return(0);
-                }
-        
-        memcpy(to,from,(unsigned int)flen);
-        return(1);
+int
+RSA_padding_add_none(unsigned char *to, int tlen, const unsigned char *from,
+    int flen)
+{
+        if (flen > tlen) {
+                RSAerr(RSA_F_RSA_PADDING_ADD_NONE,
+                    RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
+                return 0;
         }
 
-int RSA_padding_check_none(unsigned char *to, int tlen,
-        const unsigned char *from, int flen, int num)
-        {
-
-        if (flen > tlen)
-                {
-                RSAerr(RSA_F_RSA_PADDING_CHECK_NONE,RSA_R_DATA_TOO_LARGE);
-                return(-1);
-                }
+        if (flen < tlen) {
+                RSAerr(RSA_F_RSA_PADDING_ADD_NONE,
+                    RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE);
+                return 0;
+        }
+        
+        memcpy(to, from, (unsigned int)flen);
+        return 1;
+}
 
-        memset(to,0,tlen-flen);
-        memcpy(to+tlen-flen,from,flen);
-        return(tlen);
+int
+RSA_padding_check_none(unsigned char *to, int tlen, const unsigned char *from,
+    int flen, int num)
+{
+        if (flen > tlen) {
+                RSAerr(RSA_F_RSA_PADDING_CHECK_NONE, RSA_R_DATA_TOO_LARGE);
+                return -1;
         }
 
+        memset(to, 0, tlen - flen);
+        memcpy(to + tlen - flen, from, flen);
+        return tlen;
+}