generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make EVP_SealInit() and EVP_OpenInit() check EVP_EncryptInit() and

Browse Source 
EVP_DecryptInit() return values.

Update docs.
This commit is contained in:
Dr. Stephen Henson 2000-06-11 12:27:58 +00:00
parent a91dedca48
commit fd75eb50c0
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/evp/p_open.c
View File

@ -71,7 +71,7 @@ int EVP_OpenInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char *ek,
if(type) { if(type) {
EVP_CIPHER_CTX_init(ctx); EVP_CIPHER_CTX_init(ctx);
EVP_DecryptInit(ctx,type,NULL,NULL); if(!EVP_DecryptInit(ctx,type,NULL,NULL)) return 0;
} }
if(!priv) return 1; if(!priv) return 1;
@ -79,7 +79,6 @@ int EVP_OpenInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char *ek,
if (priv->type != EVP_PKEY_RSA) if (priv->type != EVP_PKEY_RSA)
{ {
EVPerr(EVP_F_EVP_OPENINIT,EVP_R_PUBLIC_KEY_NOT_RSA); EVPerr(EVP_F_EVP_OPENINIT,EVP_R_PUBLIC_KEY_NOT_RSA);
ret= -1;
goto err; goto err;
} }
@ -89,7 +88,6 @@ int EVP_OpenInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char *ek,
{ {
/* ERROR */ /* ERROR */
EVPerr(EVP_F_EVP_OPENINIT,ERR_R_MALLOC_FAILURE); EVPerr(EVP_F_EVP_OPENINIT,ERR_R_MALLOC_FAILURE);
ret= -1;
goto err; goto err;
} }

2
crypto/evp/p_seal.c
View File

@ -74,7 +74,7 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, EVP_CIPHER *type, unsigned char **ek,
if(type) { if(type) {
EVP_CIPHER_CTX_init(ctx); EVP_CIPHER_CTX_init(ctx);
EVP_EncryptInit(ctx,type,NULL,NULL); if(!EVP_EncryptInit(ctx,type,NULL,NULL)) return 0;
} }
if (npubk <= 0) return(0); if (npubk <= 0) return(0);
if (RAND_bytes(key,EVP_MAX_KEY_LENGTH) <= 0) if (RAND_bytes(key,EVP_MAX_KEY_LENGTH) <= 0)

2
doc/crypto/EVP_OpenInit.pod
View File

@ -48,7 +48,7 @@ key length must match the fixed cipher length.
EVP_OpenInit() returns -1 on error or a non zero integer (actually the EVP_OpenInit() returns -1 on error or a non zero integer (actually the
recovered secret key size) if successful. recovered secret key size) if successful.
EVP_OpenUpdate() does not return a value. EVP_OpenUpdate() returns 1 for success of 0 for failure.
EVP_OpenFinal() returns 0 if the decrypt failed or 1 for success. EVP_OpenFinal() returns 0 if the decrypt failed or 1 for success.

3
doc/crypto/EVP_SealInit.pod
View File

@ -43,7 +43,8 @@ page.
EVP_SealInit() returns -1 on error or B<npubk> if successful. EVP_SealInit() returns -1 on error or B<npubk> if successful.
EVP_SealUpdate() and EVP_SealFinal() do not return values. EVP_SealUpdate() and EVP_SealFinal() return 1 for success and 0 for
failure.
=head1 NOTES =head1 NOTES