The main() return value is a program's exit code.

[oweals/openssl.git] / crypto / rsa / rsa_oaep.c

diff --git a/crypto/rsa/rsa_oaep.c b/crypto/rsa/rsa_oaep.c
index 6907ba99694da0ed4d4bcbb039a2af32c9609e89..1465c01f4f44053c7912bb51bb6d75dedb92a379 100644 (file)
--- a/crypto/rsa/rsa_oaep.c
+++ b/crypto/rsa/rsa_oaep.c
@@ -4,22 +4,18 @@
 
 /* EME_OAEP as defined in RFC 2437 (PKCS #1 v2.0) */
 
+#if !defined(NO_SHA) && !defined(NO_SHA1)
 #include <stdio.h>
 #include "cryptlib.h"
-#include "bn.h"
-#include "rsa.h"
-#include "sha.h"
-#include "rand.h"
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
+#include <openssl/sha.h>
+#include <openssl/rand.h>
 
 int MGF1(unsigned char *mask, long len, unsigned char *seed, long seedlen);
 
-int RSA_padding_add_PKCS1_OAEP(to, tlen, from, flen, param, plen)
-     unsigned char *to;
-     int tlen;
-     unsigned char *from;
-     int flen;
-     unsigned char *param;
-     int plen;
+int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
+            unsigned char *from, int flen, unsigned char *param, int plen)
     {
     int i, emlen = tlen - 1;
     unsigned char *db, *seed;
@@ -54,7 +50,8 @@ int RSA_padding_add_PKCS1_OAEP(to, tlen, from, flen, param, plen)
           emlen - flen - 2 * SHA_DIGEST_LENGTH - 1);
     db[emlen - flen - SHA_DIGEST_LENGTH - 1] = 0x01;
     memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int) flen);
-    RAND_bytes(seed, SHA_DIGEST_LENGTH);
+    if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0)
+       return (0);
 #ifdef PKCS_TESTVECT
     memcpy(seed,
           "\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f",
@@ -73,26 +70,22 @@ int RSA_padding_add_PKCS1_OAEP(to, tlen, from, flen, param, plen)
     return (1);
     }
 
-int RSA_padding_check_PKCS1_OAEP(to, tlen, from, flen, num, param, plen)
-     unsigned char *to;
-     int tlen;
-     unsigned char *from;
-     int flen;
-     int num;
-     unsigned char *param;
-     int plen;
+int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
+            unsigned char *from, int flen, int num, unsigned char *param,
+            int plen)
     {
     int i, dblen, mlen = -1;
     unsigned char *maskeddb;
+    int lzero;
     unsigned char *db, seed[SHA_DIGEST_LENGTH], phash[SHA_DIGEST_LENGTH];
 
-    if (flen < 2 * SHA_DIGEST_LENGTH + 1)
+    if (--num < 2 * SHA_DIGEST_LENGTH + 1)
        {
        RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_OAEP_DECODING_ERROR);
        return (-1);
        }
 
-    dblen = flen - SHA_DIGEST_LENGTH;
+    dblen = num - SHA_DIGEST_LENGTH;
     db = Malloc(dblen);
     if (db == NULL)
        {
@@ -100,11 +93,12 @@ int RSA_padding_check_PKCS1_OAEP(to, tlen, from, flen, num, param, plen)
        return (-1);
        }
 
-    maskeddb = from + SHA_DIGEST_LENGTH;
+    lzero = num - flen;
+    maskeddb = from - lzero + SHA_DIGEST_LENGTH;
     
     MGF1(seed, SHA_DIGEST_LENGTH, maskeddb, dblen);
-    for (i = 0; i < SHA_DIGEST_LENGTH; i++)
-       seed[i] ^= from[i];
+    for (i = lzero; i < SHA_DIGEST_LENGTH; i++)
+       seed[i] ^= from[i - lzero];
   
     MGF1(db, dblen, seed, SHA_DIGEST_LENGTH);
     for (i = 0; i < dblen; i++)
@@ -166,3 +160,4 @@ int MGF1(unsigned char *mask, long len, unsigned char *seed, long seedlen)
        }
     return (0);
     }
+#endif