wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tabification. Remove accidental duplication.

Browse source
This commit is contained in:
Ben Laurie 2012-12-10 16:52:17 +00:00
parent b34aa49c25
commit ec40e5ff42
2 changed files with 3 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crypto/ocsp/ocsp_vfy.c
View file

@ -173,14 +173,14 @@ int OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
ret = X509_verify_cert(&ctx);
chain = tmpchain = X509_STORE_CTX_get1_chain(&ctx);
X509_STORE_CTX_cleanup(&ctx);
if (ret <= 0)
if (ret <= 0)
{
i = X509_STORE_CTX_get_error(&ctx);
OCSPerr(OCSP_F_OCSP_BASIC_VERIFY,OCSP_R_CERTIFICATE_VERIFY_ERROR);
ERR_add_error_data(2, "Verify error:",
X509_verify_cert_error_string(i));
goto end;
}
goto end;
}
verified_chain:
if(flags & OCSP_NOCHECKS)

197
test/tocsp
View file

@ -195,200 +195,3 @@ if [ $? != 0 ]; then exit 1; fi
/bin/rm $ocspdir/*.ors.der
echo "ALL OCSP TESTS SUCCESSFUL"
exit 0
#!/bin/sh
cmd='../util/shlib_wrap.sh ../apps/openssl'
ocspdir="ocsp-tests"
stdparams="-trust_other -CApath /dev/null"
for resp in `ls -1 $ocspdir/*.ors`
do
$cmd base64 -d -in $resp -out $resp.der
done
echo "=== VALID OCSP RESPONSES ==="
echo "NON-DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/ND1.ors.der -verify_other $ocspdir/ND1_Issuer_ICA.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/ND2.ors.der -verify_other $ocspdir/ND2_Issuer_Root.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/ND3.ors.der -verify_other $ocspdir/ND3_Issuer_Root.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/D1.ors.der -verify_other $ocspdir/D1_Issuer_ICA.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/D2.ors.der -verify_other $ocspdir/D2_Issuer_Root.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/D3.ors.der -verify_other $ocspdir/D3_Issuer_Root.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "=== INVALID SIGNATURE on the OCSP RESPONSE ==="
echo "NON-DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/ISOP_ND1.ors.der -verify_other $ocspdir/ND1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/ISOP_ND2.ors.der -verify_other $ocspdir/ND2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/ISOP_ND3.ors.der -verify_other $ocspdir/ND3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/ISOP_D1.ors.der -verify_other $ocspdir/D1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/ISOP_D2.ors.der -verify_other $ocspdir/D2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/ISOP_D3.ors.der -verify_other $ocspdir/D3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "=== WRONG RESPONDERID in the OCSP RESPONSE ==="
echo "NON-DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/WRID_ND1.ors.der -verify_other $ocspdir/ND1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/WRID_ND2.ors.der -verify_other $ocspdir/ND2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/WRID_ND3.ors.der -verify_other $ocspdir/ND3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/WRID_D1.ors.der -verify_other $ocspdir/D1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/WRID_D2.ors.der -verify_other $ocspdir/D2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/WRID_D3.ors.der -verify_other $ocspdir/D3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "=== WRONG ISSUERNAMEHASH in the OCSP RESPONSE ==="
echo "NON-DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/WINH_ND1.ors.der -verify_other $ocspdir/ND1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/WINH_ND2.ors.der -verify_other $ocspdir/ND2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/WINH_ND3.ors.der -verify_other $ocspdir/ND3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/WINH_D1.ors.der -verify_other $ocspdir/D1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/WINH_D2.ors.der -verify_other $ocspdir/D2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/WINH_D3.ors.der -verify_other $ocspdir/D3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "=== WRONG ISSUERKEYHASH in the OCSP RESPONSE ==="
echo "NON-DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/WIKH_ND1.ors.der -verify_other $ocspdir/ND1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/WIKH_ND2.ors.der -verify_other $ocspdir/ND2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/WIKH_ND3.ors.der -verify_other $ocspdir/ND3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/WIKH_D1.ors.der -verify_other $ocspdir/D1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/WIKH_D2.ors.der -verify_other $ocspdir/D2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/WIKH_D3.ors.der -verify_other $ocspdir/D3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "=== WRONG KEY in the DELEGATED OCSP SIGNING CERTIFICATE ==="
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/WKDOSC_D1.ors.der -verify_other $ocspdir/D1_Issuer_ICA.pem $std_params
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/WKDOSC_D2.ors.der -verify_other $ocspdir/D2_Issuer_Root.pem $std_params
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/WKDOSC_D3.ors.der -verify_other $ocspdir/D3_Issuer_Root.pem $std_params
if [ $? = 0 ]; then exit 1; fi
echo "=== INVALID SIGNATURE on the DELEGATED OCSP SIGNING CERTIFICATE ==="
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/ISDOSC_D1.ors.der -verify_other $ocspdir/D1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/ISDOSC_D2.ors.der -verify_other $ocspdir/D2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/ISDOSC_D3.ors.der -verify_other $ocspdir/D3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "=== WRONG SUBJECT NAME in the ISSUER CERTIFICATE ==="
echo "NON-DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/ND1.ors.der -verify_other $ocspdir/WSNIC_ND1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/ND2.ors.der -verify_other $ocspdir/WSNIC_ND2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/ND3.ors.der -verify_other $ocspdir/WSNIC_ND3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/D1.ors.der -verify_other $ocspdir/WSNIC_D1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/D2.ors.der -verify_other $ocspdir/WSNIC_D2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/D3.ors.der -verify_other $ocspdir/WSNIC_D3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "=== WRONG KEY in the ISSUER CERTIFICATE ==="
echo "NON-DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/ND1.ors.der -verify_other $ocspdir/WKIC_ND1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/ND2.ors.der -verify_other $ocspdir/WKIC_ND2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/ND3.ors.der -verify_other $ocspdir/WKIC_ND3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/D1.ors.der -verify_other $ocspdir/WKIC_D1_Issuer_ICA.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/D2.ors.der -verify_other $ocspdir/WKIC_D2_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/D3.ors.der -verify_other $ocspdir/WKIC_D3_Issuer_Root.pem $stdparams
if [ $? = 0 ]; then exit 1; fi
echo "=== INVALID SIGNATURE on the ISSUER CERTIFICATE ==="
# Expect success, because we're explicitly trusting the issuer certificate.
echo "NON-DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/ND1.ors.der -verify_other $ocspdir/ISIC_ND1_Issuer_ICA.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/ND2.ors.der -verify_other $ocspdir/ISIC_ND2_Issuer_Root.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "NON-DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/ND3.ors.der -verify_other $ocspdir/ISIC_ND3_Issuer_Root.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "DELEGATED; Intermediate CA -> EE"
$cmd ocsp -respin $ocspdir/D1.ors.der -verify_other $ocspdir/ISIC_D1_Issuer_ICA.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> Intermediate CA"
$cmd ocsp -respin $ocspdir/D2.ors.der -verify_other $ocspdir/ISIC_D2_Issuer_Root.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
echo "DELEGATED; Root CA -> EE"
$cmd ocsp -respin $ocspdir/D3.ors.der -verify_other $ocspdir/ISIC_D3_Issuer_Root.pem $stdparams
if [ $? != 0 ]; then exit 1; fi
/bin/rm $ocspdir/*.ors.der
echo "ALL OCSP TESTS SUCCESSFUL"
exit 0