diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-02-07 13:27:27 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-02-07 13:27:27 +0100 |
| commit | b4f62acfae5e58d8bbdb5a2f3a4d22dc7a47f8af (patch) | |
| tree | 6a9ea7adf70239d85185a20f7d5878cfe95f8070 /testing/hosts/winnetou/etc/openssl | |
| parent | 6307450b402e3c4a901fb8c0e54d8ad583ce2118 (diff) | |
| parent | 7585facf05d927eb6df3929ce09ed5e60d905437 (diff) | |
| download | vyos-strongswan-b4f62acfae5e58d8bbdb5a2f3a4d22dc7a47f8af.tar.gz vyos-strongswan-b4f62acfae5e58d8bbdb5a2f3a4d22dc7a47f8af.zip | |
Merge tag 'upstream/5.0.2'
Upstream version 5.0.2
Diffstat (limited to 'testing/hosts/winnetou/etc/openssl')
5 files changed, 24 insertions, 22 deletions
diff --git a/testing/hosts/winnetou/etc/openssl/generate-crl b/testing/hosts/winnetou/etc/openssl/generate-crl index 60e53a0a4..839816bf5 100755 --- a/testing/hosts/winnetou/etc/openssl/generate-crl +++ b/testing/hosts/winnetou/etc/openssl/generate-crl @@ -16,30 +16,32 @@ export COMMON_NAME=strongSwan +ROOT=/var/www + cd /etc/openssl openssl ca -gencrl -crldays 30 -config /etc/openssl/openssl.cnf -out crl.pem openssl crl -in crl.pem -outform der -out strongswan.crl -cp strongswan.crl /var/www/localhost/htdocs/ -cp strongswanCert.pem /var/www/localhost/htdocs/ -cp index.html /var/www/localhost/htdocs/ +cp strongswan.crl ${ROOT} +cp strongswanCert.pem ${ROOT} +cp index.html ${ROOT} cd /etc/openssl/research openssl ca -gencrl -crldays 15 -config /etc/openssl/research/openssl.cnf -out crl.pem openssl crl -in crl.pem -outform der -out research.crl -cp research.crl /var/www/localhost/htdocs/ +cp research.crl ${ROOT} cd /etc/openssl/sales openssl ca -gencrl -crldays 15 -config /etc/openssl/sales/openssl.cnf -out crl.pem openssl crl -in crl.pem -outform der -out sales.crl -cp sales.crl /var/www/localhost/htdocs/ +cp sales.crl ${ROOT} cd /etc/openssl/ecdsa openssl ca -gencrl -crldays 15 -config /etc/openssl/ecdsa/openssl.cnf -out crl.pem openssl crl -in crl.pem -outform der -out strongswan_ec.crl -cp strongswan_ec.crl /var/www/localhost/htdocs/ +cp strongswan_ec.crl ${ROOT} cd /etc/openssl/monster openssl ca -gencrl -crldays 15 -config /etc/openssl/monster/openssl.cnf -out crl.pem openssl crl -in crl.pem -outform der -out strongswan-monster.crl -cp strongswan-monster.crl /var/www/localhost/htdocs/ +cp strongswan-monster.crl ${ROOT} cd /etc/openssl/rfc3779 openssl ca -gencrl -crldays 15 -config /etc/openssl/rfc3779/openssl.cnf -out crl.pem openssl crl -in crl.pem -outform der -out strongswan_rfc3779.crl -cp strongswan_rfc3779.crl /var/www/localhost/htdocs/ +cp strongswan_rfc3779.crl ${ROOT} diff --git a/testing/hosts/winnetou/etc/openssl/index.html b/testing/hosts/winnetou/etc/openssl/index.html index 1641768ae..8cbb2c482 100644 --- a/testing/hosts/winnetou/etc/openssl/index.html +++ b/testing/hosts/winnetou/etc/openssl/index.html @@ -20,10 +20,10 @@ </li> </ul> - <h2>strongSwan UML Testing Environment</h2> + <h2>strongSwan Testing Environment</h2> <ul> <li> - <a href="testresults/">UML Test Results</a> + <a href="testresults/">Test Results</a> </li> </ul> <a href="images/umlArchitecture_large.png" target="_blank"> diff --git a/testing/hosts/winnetou/etc/openssl/ocsp/ocsp.cgi b/testing/hosts/winnetou/etc/openssl/ocsp/ocsp.cgi index cb585ed08..a62fe16bd 100755 --- a/testing/hosts/winnetou/etc/openssl/ocsp/ocsp.cgi +++ b/testing/hosts/winnetou/etc/openssl/ocsp/ocsp.cgi @@ -5,7 +5,7 @@ cd /etc/openssl echo "Content-type: application/ocsp-response" echo "" -/usr/bin/openssl ocsp -index index.txt -CA strongswanCert.pem \ - -rkey ocspKey.pem -rsigner ocspCert.pem \ - -nmin 5 \ - -reqin /dev/stdin -respout /dev/stdout +cat | /usr/bin/openssl ocsp -index index.txt -CA strongswanCert.pem \ + -rkey ocspKey.pem -rsigner ocspCert.pem \ + -nmin 5 \ + -reqin /dev/stdin -respout /dev/stdout | cat diff --git a/testing/hosts/winnetou/etc/openssl/research/ocsp/ocsp.cgi b/testing/hosts/winnetou/etc/openssl/research/ocsp/ocsp.cgi index c193e8779..32405f81c 100755 --- a/testing/hosts/winnetou/etc/openssl/research/ocsp/ocsp.cgi +++ b/testing/hosts/winnetou/etc/openssl/research/ocsp/ocsp.cgi @@ -5,7 +5,7 @@ cd /etc/openssl/research echo "Content-type: application/ocsp-response" echo "" -/usr/bin/openssl ocsp -index index.txt -CA researchCert.pem \ - -rkey ocspKey.pem -rsigner ocspCert.pem \ - -nmin 5 \ - -reqin /dev/stdin -respout /dev/stdout +cat | /usr/bin/openssl ocsp -index index.txt -CA researchCert.pem \ + -rkey ocspKey.pem -rsigner ocspCert.pem \ + -nmin 5 \ + -reqin /dev/stdin -respout /dev/stdout | cat diff --git a/testing/hosts/winnetou/etc/openssl/sales/ocsp/ocsp.cgi b/testing/hosts/winnetou/etc/openssl/sales/ocsp/ocsp.cgi index c53cb9a76..74a2aebc2 100755 --- a/testing/hosts/winnetou/etc/openssl/sales/ocsp/ocsp.cgi +++ b/testing/hosts/winnetou/etc/openssl/sales/ocsp/ocsp.cgi @@ -5,7 +5,7 @@ cd /etc/openssl/sales echo "Content-type: application/ocsp-response" echo "" -/usr/bin/openssl ocsp -index index.txt -CA salesCert.pem \ - -rkey ocspKey.pem -rsigner ocspCert.pem \ - -nmin 5 \ - -reqin /dev/stdin -respout /dev/stdout +cat | /usr/bin/openssl ocsp -index index.txt -CA salesCert.pem \ + -rkey ocspKey.pem -rsigner ocspCert.pem \ + -nmin 5 \ + -reqin /dev/stdin -respout /dev/stdout | cat |