summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortedu <>2014-04-18 21:49:19 +0000
committertedu <>2014-04-18 21:49:19 +0000
commitab7eb25a34dadf90e21160d7167c62b2755bba29 (patch)
tree0c62a62f156831e21be6c8f56e5ae38f8de154f3 /src
parent134c07c06a5d90d791e5776f48cd62e35ba34770 (diff)
downloadopenbsd-ab7eb25a34dadf90e21160d7167c62b2755bba29.tar.gz
openbsd-ab7eb25a34dadf90e21160d7167c62b2755bba29.tar.bz2
openbsd-ab7eb25a34dadf90e21160d7167c62b2755bba29.zip
XXXXXXXXXXXXXXXX -> XXX
XXXXXXXXXXXXXXXXXXXXXXX -> XXXX
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/pkcs7/pk7_doit.c6
-rw-r--r--src/lib/libssl/src/crypto/pkcs7/pk7_doit.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index fbe58cd45f..936226d736 100644
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ b/src/lib/libcrypto/pkcs7/pk7_doit.c
@@ -757,7 +757,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
757 os = p7->d.data; 757 os = p7->d.data;
758 break; 758 break;
759 case NID_pkcs7_signedAndEnveloped: 759 case NID_pkcs7_signedAndEnveloped:
760 /* XXXXXXXXXXXXXXXX */ 760 /* XXX */
761 si_sk=p7->d.signed_and_enveloped->signer_info; 761 si_sk=p7->d.signed_and_enveloped->signer_info;
762 os = p7->d.signed_and_enveloped->enc_data->enc_data; 762 os = p7->d.signed_and_enveloped->enc_data->enc_data;
763 if (!os) 763 if (!os)
@@ -772,7 +772,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
772 } 772 }
773 break; 773 break;
774 case NID_pkcs7_enveloped: 774 case NID_pkcs7_enveloped:
775 /* XXXXXXXXXXXXXXXX */ 775 /* XXX */
776 os = p7->d.enveloped->enc_data->enc_data; 776 os = p7->d.enveloped->enc_data->enc_data;
777 if (!os) 777 if (!os)
778 { 778 {
@@ -978,7 +978,7 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
978 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE); 978 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE);
979 goto err; 979 goto err;
980 } 980 }
981 /* XXXXXXXXXXXXXXXXXXXXXXX */ 981 /* XXXX */
982 ias=si->issuer_and_serial; 982 ias=si->issuer_and_serial;
983 983
984 x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial); 984 x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial);
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
index fbe58cd45f..936226d736 100644
--- a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
+++ b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
@@ -757,7 +757,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
757 os = p7->d.data; 757 os = p7->d.data;
758 break; 758 break;
759 case NID_pkcs7_signedAndEnveloped: 759 case NID_pkcs7_signedAndEnveloped:
760 /* XXXXXXXXXXXXXXXX */ 760 /* XXX */
761 si_sk=p7->d.signed_and_enveloped->signer_info; 761 si_sk=p7->d.signed_and_enveloped->signer_info;
762 os = p7->d.signed_and_enveloped->enc_data->enc_data; 762 os = p7->d.signed_and_enveloped->enc_data->enc_data;
763 if (!os) 763 if (!os)
@@ -772,7 +772,7 @@ int PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
772 } 772 }
773 break; 773 break;
774 case NID_pkcs7_enveloped: 774 case NID_pkcs7_enveloped:
775 /* XXXXXXXXXXXXXXXX */ 775 /* XXX */
776 os = p7->d.enveloped->enc_data->enc_data; 776 os = p7->d.enveloped->enc_data->enc_data;
777 if (!os) 777 if (!os)
778 { 778 {
@@ -978,7 +978,7 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
978 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE); 978 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,PKCS7_R_WRONG_PKCS7_TYPE);
979 goto err; 979 goto err;
980 } 980 }
981 /* XXXXXXXXXXXXXXXXXXXXXXX */ 981 /* XXXX */
982 ias=si->issuer_and_serial; 982 ias=si->issuer_and_serial;
983 983
984 x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial); 984 x509=X509_find_by_issuer_and_serial(cert,ias->issuer,ias->serial);