diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2001-02-02 00:45:54 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2001-02-02 00:45:54 +0000 |
| commit | 88ce56f8c19afca84548ce85bbc9b5dda3c724f9 (patch) | |
| tree | 3246395c2be795f28d84443d3a193efe6d3a96fb /crypto/asn1 | |
| parent | 664d83bb23e7e6d30b63f6127b454f7c6dc33da9 (diff) | |
| download | openssl-88ce56f8c19afca84548ce85bbc9b5dda3c724f9.tar.gz | |
Various function for commmon operations.
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/a_digest.c | 10 | ||||
| -rw-r--r-- | crypto/asn1/n_pkey.c | 12 |
2 files changed, 5 insertions, 17 deletions
diff --git a/crypto/asn1/a_digest.c b/crypto/asn1/a_digest.c index 6c12249d2c..3243beadd2 100644 --- a/crypto/asn1/a_digest.c +++ b/crypto/asn1/a_digest.c @@ -74,7 +74,6 @@ int ASN1_digest(int (*i2d)(), const EVP_MD *type, char *data, unsigned char *md, unsigned int *len) { - EVP_MD_CTX ctx; int i; unsigned char *str,*p; @@ -83,9 +82,7 @@ int ASN1_digest(int (*i2d)(), const EVP_MD *type, char *data, p=str; i2d(data,&p); - EVP_DigestInit(&ctx,type); - EVP_DigestUpdate(&ctx,str,i); - EVP_DigestFinal(&ctx,md,len); + EVP_Digest(str, i, md, len, type); OPENSSL_free(str); return(1); } @@ -96,16 +93,13 @@ int ASN1_digest(int (*i2d)(), const EVP_MD *type, char *data, int ASN1_item_digest(const ASN1_ITEM *it, const EVP_MD *type, void *asn, unsigned char *md, unsigned int *len) { - EVP_MD_CTX ctx; int i; unsigned char *str = NULL; i=ASN1_item_i2d(asn,&str, it); if (!str) return(0); - EVP_DigestInit(&ctx,type); - EVP_DigestUpdate(&ctx,str,i); - EVP_DigestFinal(&ctx,md,len); + EVP_Digest(str, i, md, len, type); OPENSSL_free(str); return(1); } diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index 82a621224b..c7b92e3a5d 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -196,14 +196,11 @@ int i2d_RSA_NET(const RSA *a, unsigned char **pp, int (*cb)(), int sgckey) i = strlen((char *)buf); /* If the key is used for SGC the algorithm is modified a little. */ if(sgckey) { - EVP_MD_CTX mctx; - EVP_DigestInit(&mctx, EVP_md5()); - EVP_DigestUpdate(&mctx, buf, i); - EVP_DigestFinal(&mctx, buf, NULL); + EVP_Digest(buf, i, buf, NULL, EVP_md5()); memcpy(buf + 16, "SGCKEYSALT", 10); i = 26; } - + EVP_BytesToKey(EVP_rc4(),EVP_md5(),NULL,buf,i,1,key,NULL); memset(buf,0,256); @@ -287,10 +284,7 @@ static RSA *d2i_RSA_NET_2(RSA **a, ASN1_OCTET_STRING *os, i = strlen((char *)buf); if(sgckey){ - EVP_MD_CTX mctx; - EVP_DigestInit(&mctx, EVP_md5()); - EVP_DigestUpdate(&mctx, buf, i); - EVP_DigestFinal(&mctx, buf, NULL); + EVP_Digest(buf, i, buf, NULL, EVP_md5()); memcpy(buf + 16, "SGCKEYSALT", 10); i = 26; } |