[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    cvs commit: openssl/crypto/rsa rsa_oaep.c
From:       ulf () openssl ! org
Date:       1999-04-29 20:31:58
[Download RAW message or body]

ulf         29-Apr-1999 22:31:58

  Modified:    crypto/rsa rsa_oaep.c
  Log:
  Bug fix.
  
  Revision  Changes    Path
  1.6       +7 -5      openssl/crypto/rsa/rsa_oaep.c
  
  Index: rsa_oaep.c
  ===================================================================
  RCS file: /e/openssl/cvs/openssl/crypto/rsa/rsa_oaep.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- rsa_oaep.c	1999/04/27 04:18:39	1.5
  +++ rsa_oaep.c	1999/04/29 20:31:56	1.6
  @@ -75,15 +75,16 @@
       {
       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)
   	{
  @@ -91,11 +92,12 @@
   	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++)
  
  
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org

[prev in list] [next in list] [prev in thread] [next in thread]