diff options
-rw-r--r-- | src/lib/libcrypto/pkcs7/pk7_doit.c | 10 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/pkcs7/pk7_doit.c | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c index df846a22cc..0abcde7feb 100644 --- a/src/lib/libcrypto/pkcs7/pk7_doit.c +++ b/src/lib/libcrypto/pkcs7/pk7_doit.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pk7_doit.c,v 1.24 2014/07/02 16:33:19 jsing Exp $ */ | 1 | /* $OpenBSD: pk7_doit.c,v 1.25 2014/07/10 12:08:50 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1037,14 +1037,6 @@ PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509) | |||
1037 | } | 1037 | } |
1038 | if ((message_digest->length != (int)md_len) || | 1038 | if ((message_digest->length != (int)md_len) || |
1039 | (memcmp(message_digest->data, md_dat, md_len))) { | 1039 | (memcmp(message_digest->data, md_dat, md_len))) { |
1040 | #if 0 | ||
1041 | { | ||
1042 | int ii; | ||
1043 | for (ii = 0; ii < message_digest->length; ii++) | ||
1044 | printf("%02X",message_digest->data[ii]); printf(" sent\n"); | ||
1045 | for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n"); | ||
1046 | } | ||
1047 | #endif | ||
1048 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, | 1040 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, |
1049 | PKCS7_R_DIGEST_FAILURE); | 1041 | PKCS7_R_DIGEST_FAILURE); |
1050 | ret = -1; | 1042 | ret = -1; |
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c index df846a22cc..0abcde7feb 100644 --- a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c +++ b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pk7_doit.c,v 1.24 2014/07/02 16:33:19 jsing Exp $ */ | 1 | /* $OpenBSD: pk7_doit.c,v 1.25 2014/07/10 12:08:50 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1037,14 +1037,6 @@ PKCS7_signatureVerify(BIO *bio, PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509) | |||
1037 | } | 1037 | } |
1038 | if ((message_digest->length != (int)md_len) || | 1038 | if ((message_digest->length != (int)md_len) || |
1039 | (memcmp(message_digest->data, md_dat, md_len))) { | 1039 | (memcmp(message_digest->data, md_dat, md_len))) { |
1040 | #if 0 | ||
1041 | { | ||
1042 | int ii; | ||
1043 | for (ii = 0; ii < message_digest->length; ii++) | ||
1044 | printf("%02X",message_digest->data[ii]); printf(" sent\n"); | ||
1045 | for (ii=0; ii<md_len; ii++) printf("%02X",md_dat[ii]); printf(" calc\n"); | ||
1046 | } | ||
1047 | #endif | ||
1048 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, | 1040 | PKCS7err(PKCS7_F_PKCS7_SIGNATUREVERIFY, |
1049 | PKCS7_R_DIGEST_FAILURE); | 1041 | PKCS7_R_DIGEST_FAILURE); |
1050 | ret = -1; | 1042 | ret = -1; |