mirror of https://github.com/wolfSSL/wolfssl.git
White space updates and revert cnf changes in lieu of PR #1734
kaleb-himes
parent
4f6ee556dc
commit
f3fd67c54b
|
|
@ -11,13 +11,13 @@ oid_section = new_oids
|
||||||
tsa_policy1 = 1.2.3.4.1
|
tsa_policy1 = 1.2.3.4.1
|
||||||
tsa_policy2 = 1.2.3.4.5.6
|
tsa_policy2 = 1.2.3.4.5.6
|
||||||
tsa_policy3 = 1.2.3.4.5.7
|
tsa_policy3 = 1.2.3.4.5.7
|
||||||
#businessCategory=2.5.4.15
|
businessCategory=2.5.4.15
|
||||||
#streetAddress=2.5.4.9
|
streetAddress=2.5.4.9
|
||||||
#stateOrProvinceName=2.5.4.8
|
stateOrProvinceName=2.5.4.8
|
||||||
#countryName=2.5.4.6
|
countryName=2.5.4.6
|
||||||
#jurisdictionOfIncorporationLocalityName=1.3.6.1.4.1.311.60.2.1.1
|
jurisdictionOfIncorporationLocalityName=1.3.6.1.4.1.311.60.2.1.1
|
||||||
#jurisdictionOfIncorporationStateOrProvinceName=1.3.6.1.4.1.311.60.2.1.2
|
jurisdictionOfIncorporationStateOrProvinceName=1.3.6.1.4.1.311.60.2.1.2
|
||||||
#jurisdictionOfIncorporationCountryName=1.3.6.1.4.1.311.60.2.1.3
|
jurisdictionOfIncorporationCountryName=1.3.6.1.4.1.311.60.2.1.3
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
[ ca ]
|
[ ca ]
|
||||||
|
|
|
||||||
|
|
@ -10,158 +10,158 @@ check_result() {
|
||||||
|
|
||||||
# Args: 1=FileName, 2=CN, 3=AltName, 4=CA
|
# Args: 1=FileName, 2=CN, 3=AltName, 4=CA
|
||||||
build_test_cert_conf() {
|
build_test_cert_conf() {
|
||||||
echo "# Generated openssl conf" > "$1".conf
|
echo "# Generated openssl conf" > "$1".conf
|
||||||
echo "" >> "$1".conf
|
echo "" >> "$1".conf
|
||||||
echo "[ ca ]" >> "$1".conf
|
echo "[ ca ]" >> "$1".conf
|
||||||
echo "default_ca = CA_default" >> "$1".conf
|
echo "default_ca = CA_default" >> "$1".conf
|
||||||
echo "[ CA_default ]" >> "$1".conf
|
echo "[ CA_default ]" >> "$1".conf
|
||||||
echo "certificate = ../ca-cert.pem" >> "$1".conf
|
echo "certificate = ../ca-cert.pem" >> "$1".conf
|
||||||
echo "database = ./index.txt" >> "$1".conf
|
echo "database = ./index.txt" >> "$1".conf
|
||||||
echo "new_certs_dir = ./certs" >> "$1".conf
|
echo "new_certs_dir = ./certs" >> "$1".conf
|
||||||
echo "private_key = ./private/cakey.pem" >> "$1".conf
|
echo "private_key = ./private/cakey.pem" >> "$1".conf
|
||||||
echo "serial = ./serial" >> "$1".conf
|
echo "serial = ./serial" >> "$1".conf
|
||||||
echo "default_md = sha256" >> "$1".conf
|
echo "default_md = sha256" >> "$1".conf
|
||||||
echo "default_days = 1000" >> "$1".conf
|
echo "default_days = 1000" >> "$1".conf
|
||||||
echo "policy = default_ca_policy" >> "$1".conf
|
echo "policy = default_ca_policy" >> "$1".conf
|
||||||
echo "" >> "$1".conf
|
echo "" >> "$1".conf
|
||||||
echo "[ default_ca_policy ]" >> "$1".conf
|
echo "[ default_ca_policy ]" >> "$1".conf
|
||||||
echo "commonName = supplied" >> "$1".conf
|
echo "commonName = supplied" >> "$1".conf
|
||||||
echo "stateOrProvinceName = supplied" >> "$1".conf
|
echo "stateOrProvinceName = supplied" >> "$1".conf
|
||||||
echo "countryName = supplied" >> "$1".conf
|
echo "countryName = supplied" >> "$1".conf
|
||||||
echo "emailAddress = supplied" >> "$1".conf
|
echo "emailAddress = supplied" >> "$1".conf
|
||||||
echo "organizationName = optional" >> "$1".conf
|
echo "organizationName = optional" >> "$1".conf
|
||||||
echo "organizationalUnitName = optional" >> "$1".conf
|
echo "organizationalUnitName = optional" >> "$1".conf
|
||||||
echo "" >> "$1".conf
|
echo "" >> "$1".conf
|
||||||
echo "[ req ]" >> "$1".conf
|
echo "[ req ]" >> "$1".conf
|
||||||
echo "prompt = no" >> "$1".conf
|
echo "prompt = no" >> "$1".conf
|
||||||
echo "default_bits = 2048" >> "$1".conf
|
echo "default_bits = 2048" >> "$1".conf
|
||||||
echo "distinguished_name = req_distinguished_name" >> "$1".conf
|
echo "distinguished_name = req_distinguished_name" >> "$1".conf
|
||||||
if [ -n "$3" ]; then
|
if [ -n "$3" ]; then
|
||||||
echo "req_extensions = req_ext" >> "$1".conf
|
echo "req_extensions = req_ext" >> "$1".conf
|
||||||
fi
|
fi
|
||||||
if [ -n "$4" ]; then
|
if [ -n "$4" ]; then
|
||||||
echo "basicConstraints=CA:true,pathlen:0" >> "$1".conf
|
echo "basicConstraints=CA:true,pathlen:0" >> "$1".conf
|
||||||
echo "" >> "$1".conf
|
echo "" >> "$1".conf
|
||||||
fi
|
fi
|
||||||
echo "" >> "$1".conf
|
echo "" >> "$1".conf
|
||||||
echo "[ req_distinguished_name ]" >> "$1".conf
|
echo "[ req_distinguished_name ]" >> "$1".conf
|
||||||
echo "C = US" >> "$1".conf
|
echo "C = US" >> "$1".conf
|
||||||
echo "ST = Montana" >> "$1".conf
|
echo "ST = Montana" >> "$1".conf
|
||||||
echo "L = Bozeman" >> "$1".conf
|
echo "L = Bozeman" >> "$1".conf
|
||||||
echo "OU = Engineering" >> "$1".conf
|
echo "OU = Engineering" >> "$1".conf
|
||||||
echo "CN = $2" >> "$1".conf
|
echo "CN = $2" >> "$1".conf
|
||||||
echo "emailAddress = info@wolfssl.com" >> "$1".conf
|
echo "emailAddress = info@wolfssl.com" >> "$1".conf
|
||||||
echo "" >> "$1".conf
|
echo "" >> "$1".conf
|
||||||
if [ -n "$3" ]; then
|
if [ -n "$3" ]; then
|
||||||
echo "[ req_ext ]" >> "$1".conf
|
echo "[ req_ext ]" >> "$1".conf
|
||||||
if [ "$3" != *"DER"* ]; then
|
if [ "$3" != *"DER"* ]; then
|
||||||
echo "subjectAltName = @alt_names" >> "$1".conf
|
echo "subjectAltName = @alt_names" >> "$1".conf
|
||||||
echo "[alt_names]" >> "$1".conf
|
echo "[alt_names]" >> "$1".conf
|
||||||
echo "DNS.1 = $3" >> "$1".conf
|
echo "DNS.1 = $3" >> "$1".conf
|
||||||
else
|
else
|
||||||
echo "subjectAltName = $3" >> "$1".conf
|
echo "subjectAltName = $3" >> "$1".conf
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Args: 1=FileName
|
# Args: 1=FileName
|
||||||
generate_test_cert() {
|
generate_test_cert() {
|
||||||
rm "$1".der
|
rm "$1".der
|
||||||
rm "$1".pem
|
rm "$1".pem
|
||||||
|
|
||||||
echo "step 1 create configuration"
|
echo "step 1 create configuration"
|
||||||
build_test_cert_conf "$1" "$2" "$3"
|
build_test_cert_conf "$1" "$2" "$3"
|
||||||
check_result $?
|
check_result $?
|
||||||
|
|
||||||
echo "step 2 create csr"
|
echo "step 2 create csr"
|
||||||
openssl req -new -sha256 -out "$1".csr -key ../server-key.pem -config "$1".conf
|
openssl req -new -sha256 -out "$1".csr -key ../server-key.pem -config "$1".conf
|
||||||
check_result $?
|
check_result $?
|
||||||
|
|
||||||
echo "step 3 check csr"
|
echo "step 3 check csr"
|
||||||
openssl req -text -noout -in "$1".csr
|
openssl req -text -noout -in "$1".csr
|
||||||
check_result $?
|
check_result $?
|
||||||
|
|
||||||
echo "step 4 create cert"
|
echo "step 4 create cert"
|
||||||
if [ "$3" = "" ]; then
|
if [ "$3" = "" ]; then
|
||||||
openssl x509 -req -days 1000 -sha256 \
|
openssl x509 -req -days 1000 -sha256 \
|
||||||
-in "$1".csr -signkey ../server-key.pem \
|
-in "$1".csr -signkey ../server-key.pem \
|
||||||
-out "$1".pem -extfile "$1".conf
|
-out "$1".pem -extfile "$1".conf
|
||||||
else
|
else
|
||||||
openssl x509 -req -days 1000 -sha256 \
|
openssl x509 -req -days 1000 -sha256 \
|
||||||
-in "$1".csr -signkey ../server-key.pem \
|
-in "$1".csr -signkey ../server-key.pem \
|
||||||
-out "$1".pem -extensions req_ext -extfile "$1".conf
|
-out "$1".pem -extensions req_ext -extfile "$1".conf
|
||||||
fi
|
fi
|
||||||
check_result $?
|
check_result $?
|
||||||
rm "$1".conf
|
rm "$1".conf
|
||||||
rm "$1".csr
|
rm "$1".csr
|
||||||
|
|
||||||
if [ -n "$4" ]; then
|
if [ -n "$4" ]; then
|
||||||
echo "step 5 generate crl"
|
echo "step 5 generate crl"
|
||||||
mkdir ../crl/demoCA
|
mkdir ../crl/demoCA
|
||||||
touch ../crl/demoCA/index.txt
|
touch ../crl/demoCA/index.txt
|
||||||
echo "01" > ../crl/crlnumber
|
echo "01" > ../crl/crlnumber
|
||||||
openssl ca -config ../renewcerts/wolfssl.cnf -gencrl -crldays 1000 \
|
openssl ca -config ../renewcerts/wolfssl.cnf -gencrl -crldays 1000 \
|
||||||
-out crl.revoked -keyfile ../server-key.pem -cert "$1".pem
|
-out crl.revoked -keyfile ../server-key.pem -cert "$1".pem
|
||||||
check_result $?
|
check_result $?
|
||||||
rm ../crl/"$1"Crl.pem
|
rm ../crl/"$1"Crl.pem
|
||||||
openssl crl -in crl.revoked -text > tmp.pem
|
openssl crl -in crl.revoked -text > tmp.pem
|
||||||
check_result $?
|
check_result $?
|
||||||
mv tmp.pem ../crl/"$1"Crl.pem
|
mv tmp.pem ../crl/"$1"Crl.pem
|
||||||
rm crl.revoked
|
rm crl.revoked
|
||||||
rm -rf ../crl/demoCA
|
rm -rf ../crl/demoCA
|
||||||
rm ../crl/crlnumber*
|
rm ../crl/crlnumber*
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "step 6 add cert text information to pem"
|
echo "step 6 add cert text information to pem"
|
||||||
openssl x509 -inform pem -in "$1".pem -text > tmp.pem
|
openssl x509 -inform pem -in "$1".pem -text > tmp.pem
|
||||||
check_result $?
|
check_result $?
|
||||||
mv tmp.pem "$1".pem
|
mv tmp.pem "$1".pem
|
||||||
|
|
||||||
echo "step 7 make binary der version"
|
echo "step 7 make binary der version"
|
||||||
openssl x509 -inform pem -in "$1".pem -outform der -out "$1".der
|
openssl x509 -inform pem -in "$1".pem -outform der -out "$1".der
|
||||||
check_result $?
|
check_result $?
|
||||||
}
|
}
|
||||||
|
|
||||||
generate_expired_certs() {
|
generate_expired_certs() {
|
||||||
rm "$1".der
|
rm "$1".der
|
||||||
rm "$1".pem
|
rm "$1".pem
|
||||||
|
|
||||||
mkdir -p certs
|
mkdir -p certs
|
||||||
touch ./index.txt
|
touch ./index.txt
|
||||||
echo 1000 > ./serial
|
echo 1000 > ./serial
|
||||||
|
|
||||||
echo "step 1 create configuration"
|
echo "step 1 create configuration"
|
||||||
build_test_cert_conf "$1" www.wolfssl.com 0 "$3"
|
build_test_cert_conf "$1" www.wolfssl.com 0 "$3"
|
||||||
check_result $?
|
check_result $?
|
||||||
|
|
||||||
echo "step 2 create csr"
|
echo "step 2 create csr"
|
||||||
openssl req -new -sha256 -out "$1".csr -key "$2" -config "$1".conf
|
openssl req -new -sha256 -out "$1".csr -key "$2" -config "$1".conf
|
||||||
check_result $?
|
check_result $?
|
||||||
|
|
||||||
echo "step 3 check csr"
|
echo "step 3 check csr"
|
||||||
openssl req -text -noout -in "$1".csr
|
openssl req -text -noout -in "$1".csr
|
||||||
check_result $?
|
check_result $?
|
||||||
|
|
||||||
echo "step 4 create cert"
|
echo "step 4 create cert"
|
||||||
openssl ca -config ../renewcerts/wolfssl.cnf -selfsign -config "$1".conf \
|
openssl ca -config ../renewcerts/wolfssl.cnf -selfsign -config "$1".conf \
|
||||||
-keyfile "$2" -in "$1".csr -out "$1".pem \
|
-keyfile "$2" -in "$1".csr -out "$1".pem \
|
||||||
-startdate 201807310000Z -enddate 201808300000Z -batch
|
-startdate 201807310000Z -enddate 201808300000Z -batch
|
||||||
check_result $?
|
check_result $?
|
||||||
rm "$1".conf
|
rm "$1".conf
|
||||||
rm "$1".csr
|
rm "$1".csr
|
||||||
|
|
||||||
echo "step 5 add cert text information to pem"
|
echo "step 5 add cert text information to pem"
|
||||||
openssl x509 -inform pem -in "$1".pem -text > tmp.pem
|
openssl x509 -inform pem -in "$1".pem -text > tmp.pem
|
||||||
check_result $?
|
check_result $?
|
||||||
mv tmp.pem "$1".pem
|
mv tmp.pem "$1".pem
|
||||||
|
|
||||||
echo "step 7 make binary der version"
|
echo "step 7 make binary der version"
|
||||||
openssl x509 -inform pem -in "$1".pem -outform der -out "$1".der
|
openssl x509 -inform pem -in "$1".pem -outform der -out "$1".der
|
||||||
check_result $?
|
check_result $?
|
||||||
|
|
||||||
rm -rf certs
|
rm -rf certs
|
||||||
rm ./index.txt*
|
rm ./index.txt*
|
||||||
rm ./serial*
|
rm ./serial*
|
||||||
}
|
}
|
||||||
|
|
||||||
# Generate Good CN=localhost, Alt=None
|
# Generate Good CN=localhost, Alt=None
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue