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

Add missing EVP_CIPHER_CTX_{init,cleanup}

Browse Source
This commit is contained in:
Dr. Stephen Henson 2001-10-20 16:18:03 +00:00
parent 31fe950d2b
commit cecd263878
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/speed.c
View File

@ -1215,6 +1215,7 @@ int MAIN(int argc, char **argv)
names[D_EVP]=OBJ_nid2ln(evp->nid); names[D_EVP]=OBJ_nid2ln(evp->nid);
print_message(names[D_EVP],save_count, print_message(names[D_EVP],save_count,
lengths[j]); lengths[j]);
EVP_CIPHER_CTX_init(&ctx);
if(decrypt) if(decrypt)
EVP_DecryptInit_ex(&ctx,evp,NULL,key16,iv); EVP_DecryptInit_ex(&ctx,evp,NULL,key16,iv);
else else
@ -1232,6 +1233,7 @@ int MAIN(int argc, char **argv)
else else
EVP_EncryptFinal_ex(&ctx,buf,&outl); EVP_EncryptFinal_ex(&ctx,buf,&outl);
d=Time_F(STOP,usertime); d=Time_F(STOP,usertime);
EVP_CIPHER_CTX_cleanup(&ctx);
BIO_printf(bio_err,"%ld %s's in %.2fs\n", BIO_printf(bio_err,"%ld %s's in %.2fs\n",
count,names[D_EVP],d); count,names[D_EVP],d);
results[D_EVP][j]=((double)count)/d*lengths[j]; results[D_EVP][j]=((double)count)/d*lengths[j];

5
crypto/pem/pem_lib.c
View File

@ -345,10 +345,12 @@ int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x,
PEM_proc_type(buf,PEM_TYPE_ENCRYPTED); PEM_proc_type(buf,PEM_TYPE_ENCRYPTED);
PEM_dek_info(buf,objstr,8,(char *)iv); PEM_dek_info(buf,objstr,8,(char *)iv);
/* k=strlen(buf); */ /* k=strlen(buf); */
EVP_CIPHER_CTX_init(&ctx);
EVP_EncryptInit_ex(&ctx,enc,NULL,key,iv); EVP_EncryptInit_ex(&ctx,enc,NULL,key,iv);
EVP_EncryptUpdate(&ctx,data,&j,data,i); EVP_EncryptUpdate(&ctx,data,&j,data,i);
EVP_EncryptFinal_ex(&ctx,&(data[j]),&i); EVP_EncryptFinal_ex(&ctx,&(data[j]),&i);
EVP_CIPHER_CTX_cleanup(&ctx);
i+=j; i+=j;
ret=1; ret=1;
} }
@ -399,6 +401,7 @@ int PEM_do_header(EVP_CIPHER_INFO *cipher, unsigned char *data, long *plen,
(unsigned char *)buf,klen,1,key,NULL); (unsigned char *)buf,klen,1,key,NULL);
j=(int)len; j=(int)len;
EVP_CIPHER_CTX_init(&ctx);
EVP_DecryptInit_ex(&ctx,cipher->cipher,NULL, key,&(cipher->iv[0])); EVP_DecryptInit_ex(&ctx,cipher->cipher,NULL, key,&(cipher->iv[0]));
EVP_DecryptUpdate(&ctx,data,&i,data,j); EVP_DecryptUpdate(&ctx,data,&i,data,j);
o=EVP_DecryptFinal_ex(&ctx,&(data[i]),&j); o=EVP_DecryptFinal_ex(&ctx,&(data[i]),&j);