projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a6e7fcd
)
Remove old digest type hacks for non RSA keys.
author
Dr. Stephen Henson
<steve@openssl.org>
Thu, 18 May 2006 13:05:20 +0000
(13:05 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Thu, 18 May 2006 13:05:20 +0000
(13:05 +0000)
crypto/pkcs7/pk7_doit.c
patch
|
blob
|
history
diff --git
a/crypto/pkcs7/pk7_doit.c
b/crypto/pkcs7/pk7_doit.c
index a3c8baf4667530ae45a66053f6bbf3b24759cb2b..60cffb0782c053245254c20efa1ec750c89759f6 100644
(file)
--- a/
crypto/pkcs7/pk7_doit.c
+++ b/
crypto/pkcs7/pk7_doit.c
@@
-794,15
+794,6
@@
int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
OPENSSL_free(abuf);
}
OPENSSL_free(abuf);
}
-#ifndef OPENSSL_NO_DSA
- if (si->pkey->type == EVP_PKEY_DSA)
- ctx_tmp.digest=EVP_dss1();
-#endif
-#ifndef OPENSSL_NO_ECDSA
- if (si->pkey->type == EVP_PKEY_EC)
- ctx_tmp.digest=EVP_ecdsa();
-#endif
-
if (!EVP_SignFinal(&ctx_tmp,(unsigned char *)buf->data,
(unsigned int *)&buf->length,si->pkey))
{
if (!EVP_SignFinal(&ctx_tmp,(unsigned char *)buf->data,
(unsigned int *)&buf->length,si->pkey))
{
@@
-1011,14
+1002,6
@@
for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n");
ret = -1;
goto err;
}
ret = -1;
goto err;
}
-#if 0
-#ifndef OPENSSL_NO_DSA
- if(pkey->type == EVP_PKEY_DSA) mdc_tmp.digest=EVP_dss1();
-#endif
-#ifndef OPENSSL_NO_ECDSA
- if (pkey->type == EVP_PKEY_EC) mdc_tmp.digest=EVP_ecdsa();
-#endif
-#endif
i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey);
EVP_PKEY_free(pkey);
i=EVP_VerifyFinal(&mdc_tmp,os->data,os->length, pkey);
EVP_PKEY_free(pkey);