fix formatting so that the file can be view with any tab-width
This commit is contained in:
parent
3cad81f6fe
commit
e1a4814cd4
@ -34,158 +34,158 @@ int MGF1(unsigned char *mask, long len,
|
|||||||
int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
|
int RSA_padding_add_PKCS1_OAEP(unsigned char *to, int tlen,
|
||||||
const unsigned char *from, int flen,
|
const unsigned char *from, int flen,
|
||||||
const unsigned char *param, int plen)
|
const unsigned char *param, int plen)
|
||||||
{
|
|
||||||
int i, emlen = tlen - 1;
|
|
||||||
unsigned char *db, *seed;
|
|
||||||
unsigned char *dbmask, seedmask[SHA_DIGEST_LENGTH];
|
|
||||||
|
|
||||||
if (flen > emlen - 2 * SHA_DIGEST_LENGTH - 1)
|
|
||||||
{
|
{
|
||||||
RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP,
|
int i, emlen = tlen - 1;
|
||||||
RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
|
unsigned char *db, *seed;
|
||||||
return (0);
|
unsigned char *dbmask, seedmask[SHA_DIGEST_LENGTH];
|
||||||
}
|
|
||||||
|
|
||||||
if (emlen < 2 * SHA_DIGEST_LENGTH + 1)
|
if (flen > emlen - 2 * SHA_DIGEST_LENGTH - 1)
|
||||||
{
|
{
|
||||||
RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, RSA_R_KEY_SIZE_TOO_SMALL);
|
RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP,
|
||||||
return (0);
|
RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE);
|
||||||
}
|
return (0);
|
||||||
|
}
|
||||||
dbmask = OPENSSL_malloc(emlen - SHA_DIGEST_LENGTH);
|
|
||||||
if (dbmask == NULL)
|
|
||||||
{
|
|
||||||
RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, ERR_R_MALLOC_FAILURE);
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
|
|
||||||
to[0] = 0;
|
if (emlen < 2 * SHA_DIGEST_LENGTH + 1)
|
||||||
seed = to + 1;
|
{
|
||||||
db = to + SHA_DIGEST_LENGTH + 1;
|
RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, RSA_R_KEY_SIZE_TOO_SMALL);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
dbmask = OPENSSL_malloc(emlen - SHA_DIGEST_LENGTH);
|
||||||
|
if (dbmask == NULL)
|
||||||
|
{
|
||||||
|
RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, ERR_R_MALLOC_FAILURE);
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
EVP_Digest((void *)param, plen, db, NULL, EVP_sha1());
|
to[0] = 0;
|
||||||
memset(db + SHA_DIGEST_LENGTH, 0,
|
seed = to + 1;
|
||||||
emlen - flen - 2 * SHA_DIGEST_LENGTH - 1);
|
db = to + SHA_DIGEST_LENGTH + 1;
|
||||||
db[emlen - flen - SHA_DIGEST_LENGTH - 1] = 0x01;
|
|
||||||
memcpy(db + emlen - flen - SHA_DIGEST_LENGTH, from, (unsigned int) flen);
|
EVP_Digest((void *)param, plen, db, NULL, EVP_sha1());
|
||||||
if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0)
|
memset(db + SHA_DIGEST_LENGTH, 0,
|
||||||
return (0);
|
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);
|
||||||
|
if (RAND_bytes(seed, SHA_DIGEST_LENGTH) <= 0)
|
||||||
|
return (0);
|
||||||
#ifdef PKCS_TESTVECT
|
#ifdef PKCS_TESTVECT
|
||||||
memcpy(seed,
|
memcpy(seed,
|
||||||
"\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f",
|
"\xaa\xfd\x12\xf6\x59\xca\xe6\x34\x89\xb4\x79\xe5\x07\x6d\xde\xc2\xf0\x6c\xb5\x8f",
|
||||||
20);
|
20);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
MGF1(dbmask, emlen - SHA_DIGEST_LENGTH, seed, SHA_DIGEST_LENGTH);
|
MGF1(dbmask, emlen - SHA_DIGEST_LENGTH, seed, SHA_DIGEST_LENGTH);
|
||||||
for (i = 0; i < emlen - SHA_DIGEST_LENGTH; i++)
|
for (i = 0; i < emlen - SHA_DIGEST_LENGTH; i++)
|
||||||
db[i] ^= dbmask[i];
|
db[i] ^= dbmask[i];
|
||||||
|
|
||||||
|
MGF1(seedmask, SHA_DIGEST_LENGTH, db, emlen - SHA_DIGEST_LENGTH);
|
||||||
|
for (i = 0; i < SHA_DIGEST_LENGTH; i++)
|
||||||
|
seed[i] ^= seedmask[i];
|
||||||
|
|
||||||
MGF1(seedmask, SHA_DIGEST_LENGTH, db, emlen - SHA_DIGEST_LENGTH);
|
OPENSSL_free(dbmask);
|
||||||
for (i = 0; i < SHA_DIGEST_LENGTH; i++)
|
return 1;
|
||||||
seed[i] ^= seedmask[i];
|
}
|
||||||
|
|
||||||
OPENSSL_free(dbmask);
|
|
||||||
return (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
|
int RSA_padding_check_PKCS1_OAEP(unsigned char *to, int tlen,
|
||||||
const unsigned char *from, int flen, int num,
|
const unsigned char *from, int flen, int num,
|
||||||
const unsigned char *param, int plen)
|
const unsigned char *param, int plen)
|
||||||
{
|
|
||||||
int i, dblen, mlen = -1;
|
|
||||||
const unsigned char *maskeddb;
|
|
||||||
int lzero;
|
|
||||||
unsigned char *db = NULL, seed[SHA_DIGEST_LENGTH], phash[SHA_DIGEST_LENGTH];
|
|
||||||
|
|
||||||
if (--num < 2 * SHA_DIGEST_LENGTH + 1)
|
|
||||||
goto decoding_err;
|
|
||||||
|
|
||||||
lzero = num - flen;
|
|
||||||
if (lzero < 0)
|
|
||||||
goto decoding_err;
|
|
||||||
maskeddb = from - lzero + SHA_DIGEST_LENGTH;
|
|
||||||
|
|
||||||
dblen = num - SHA_DIGEST_LENGTH;
|
|
||||||
db = OPENSSL_malloc(dblen);
|
|
||||||
if (db == NULL)
|
|
||||||
{
|
{
|
||||||
RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, ERR_R_MALLOC_FAILURE);
|
int i, dblen, mlen = -1;
|
||||||
return (-1);
|
const unsigned char *maskeddb;
|
||||||
}
|
int lzero;
|
||||||
|
unsigned char *db = NULL, seed[SHA_DIGEST_LENGTH], phash[SHA_DIGEST_LENGTH];
|
||||||
|
|
||||||
MGF1(seed, SHA_DIGEST_LENGTH, maskeddb, dblen);
|
if (--num < 2 * SHA_DIGEST_LENGTH + 1)
|
||||||
for (i = lzero; i < SHA_DIGEST_LENGTH; i++)
|
goto decoding_err;
|
||||||
seed[i] ^= from[i - lzero];
|
|
||||||
|
|
||||||
MGF1(db, dblen, seed, SHA_DIGEST_LENGTH);
|
|
||||||
for (i = 0; i < dblen; i++)
|
|
||||||
db[i] ^= maskeddb[i];
|
|
||||||
|
|
||||||
EVP_Digest((void *)param, plen, phash, NULL, EVP_sha1());
|
lzero = num - flen;
|
||||||
|
if (lzero < 0)
|
||||||
if (memcmp(db, phash, SHA_DIGEST_LENGTH) != 0)
|
goto decoding_err;
|
||||||
goto decoding_err;
|
maskeddb = from - lzero + SHA_DIGEST_LENGTH;
|
||||||
else
|
|
||||||
{
|
dblen = num - SHA_DIGEST_LENGTH;
|
||||||
for (i = SHA_DIGEST_LENGTH; i < dblen; i++)
|
db = OPENSSL_malloc(dblen);
|
||||||
if (db[i] != 0x00)
|
if (db == NULL)
|
||||||
break;
|
|
||||||
if (db[i] != 0x01 || i++ >= dblen)
|
|
||||||
goto decoding_err;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mlen = dblen - i;
|
|
||||||
if (tlen < mlen)
|
|
||||||
{
|
{
|
||||||
RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_DATA_TOO_LARGE);
|
RSAerr(RSA_F_RSA_PADDING_ADD_PKCS1_OAEP, ERR_R_MALLOC_FAILURE);
|
||||||
mlen = -1;
|
return (-1);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
memcpy(to, db + i, mlen);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OPENSSL_free(db);
|
|
||||||
return (mlen);
|
|
||||||
|
|
||||||
|
MGF1(seed, SHA_DIGEST_LENGTH, maskeddb, dblen);
|
||||||
|
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++)
|
||||||
|
db[i] ^= maskeddb[i];
|
||||||
|
|
||||||
|
EVP_Digest((void *)param, plen, phash, NULL, EVP_sha1());
|
||||||
|
|
||||||
|
if (memcmp(db, phash, SHA_DIGEST_LENGTH) != 0)
|
||||||
|
goto decoding_err;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (i = SHA_DIGEST_LENGTH; i < dblen; i++)
|
||||||
|
if (db[i] != 0x00)
|
||||||
|
break;
|
||||||
|
if (db[i] != 0x01 || i++ >= dblen)
|
||||||
|
goto decoding_err;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mlen = dblen - i;
|
||||||
|
if (tlen < mlen)
|
||||||
|
{
|
||||||
|
RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_DATA_TOO_LARGE);
|
||||||
|
mlen = -1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
memcpy(to, db + i, mlen);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
OPENSSL_free(db);
|
||||||
|
return mlen;
|
||||||
|
|
||||||
decoding_err:
|
decoding_err:
|
||||||
/* to avoid chosen ciphertext attacks, the error message should not reveal
|
/* to avoid chosen ciphertext attacks, the error message should not reveal
|
||||||
* which kind of decoding error happened */
|
* which kind of decoding error happened */
|
||||||
RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_OAEP_DECODING_ERROR);
|
RSAerr(RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP, RSA_R_OAEP_DECODING_ERROR);
|
||||||
if (db != NULL) OPENSSL_free(db);
|
if (db != NULL) OPENSSL_free(db);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int MGF1(unsigned char *mask, long len,
|
int MGF1(unsigned char *mask, long len,
|
||||||
const unsigned char *seed, long seedlen)
|
const unsigned char *seed, long seedlen)
|
||||||
{
|
|
||||||
long i, outlen = 0;
|
|
||||||
unsigned char cnt[4];
|
|
||||||
EVP_MD_CTX c;
|
|
||||||
unsigned char md[SHA_DIGEST_LENGTH];
|
|
||||||
|
|
||||||
EVP_MD_CTX_init(&c);
|
|
||||||
for (i = 0; outlen < len; i++)
|
|
||||||
{
|
{
|
||||||
cnt[0] = (unsigned char)((i >> 24) & 255);
|
long i, outlen = 0;
|
||||||
cnt[1] = (unsigned char)((i >> 16) & 255);
|
unsigned char cnt[4];
|
||||||
cnt[2] = (unsigned char)((i >> 8)) & 255;
|
EVP_MD_CTX c;
|
||||||
cnt[3] = (unsigned char)(i & 255);
|
unsigned char md[SHA_DIGEST_LENGTH];
|
||||||
EVP_DigestInit(&c,EVP_sha1());
|
|
||||||
EVP_DigestUpdate(&c, seed, seedlen);
|
EVP_MD_CTX_init(&c);
|
||||||
EVP_DigestUpdate(&c, cnt, 4);
|
for (i = 0; outlen < len; i++)
|
||||||
if (outlen + SHA_DIGEST_LENGTH <= len)
|
{
|
||||||
{
|
cnt[0] = (unsigned char)((i >> 24) & 255);
|
||||||
EVP_DigestFinal(&c, mask + outlen, NULL);
|
cnt[1] = (unsigned char)((i >> 16) & 255);
|
||||||
outlen += SHA_DIGEST_LENGTH;
|
cnt[2] = (unsigned char)((i >> 8)) & 255;
|
||||||
}
|
cnt[3] = (unsigned char)(i & 255);
|
||||||
else
|
EVP_DigestInit(&c,EVP_sha1());
|
||||||
{
|
EVP_DigestUpdate(&c, seed, seedlen);
|
||||||
EVP_DigestFinal(&c, md, NULL);
|
EVP_DigestUpdate(&c, cnt, 4);
|
||||||
memcpy(mask + outlen, md, len - outlen);
|
if (outlen + SHA_DIGEST_LENGTH <= len)
|
||||||
outlen = len;
|
{
|
||||||
}
|
EVP_DigestFinal(&c, mask + outlen, NULL);
|
||||||
|
outlen += SHA_DIGEST_LENGTH;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
EVP_DigestFinal(&c, md, NULL);
|
||||||
|
memcpy(mask + outlen, md, len - outlen);
|
||||||
|
outlen = len;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
EVP_MD_CTX_cleanup(&c);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
EVP_MD_CTX_cleanup(&c);
|
|
||||||
return (0);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user