denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Remove unused custom OIDs from openssl.cnf files

Browse Source 
ClientAuthentication is known in OpenSSL 1.1 and the redefinition, therefore,
causes an error.  These two OIDs are not used anyway in these config
files.
This commit is contained in:
Tobias Brunner
2018-10-30 15:03:34 +01:00
parent e660f4579b
commit 3fbeeef908
7 changed files with 47 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/hosts/winnetou/etc/openssl/duck/openssl.cnf
+6 -14
View File
@@ -1,19 +1,11 @@
# openssl.cnf - OpenSSL configuration file for the ZHW PKI # openssl.cnf - OpenSSL configuration file
# Mario Strasser <[email protected]> #
#
# This definitions were set by the ca_init script DO NOT change # This definitions were set by the ca_init script DO NOT change
# them manually. # them manually.
CAHOME = /etc/openssl/duck CAHOME = /etc/openssl/duck
RANDFILE = $CAHOME/.rand RANDFILE = $CAHOME/.rand
# Extra OBJECT IDENTIFIER info:
oid_section = new_oids
[ new_oids ]
SmartcardLogin = 1.3.6.1.4.1.311.20.2
ClientAuthentication = 1.3.6.1.4.1.311.20.2.2
#################################################################### ####################################################################
[ ca ] [ ca ]
@@ -21,7 +13,7 @@ default_ca = root_ca # The default ca section
#################################################################### ####################################################################
[ root_ca ] [ root_ca ]
dir = $CAHOME dir = $CAHOME
certs = $dir/certs # Where the issued certs are kept certs = $dir/certs # Where the issued certs are kept
@@ -82,7 +74,7 @@ x509_extensions = ca_ext # The extensions to add to the self signed cert
# req_extensions = v3_req # The extensions to add to a certificate request # req_extensions = v3_req # The extensions to add to a certificate request
# This sets a mask for permitted string types. There are several options. # This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString. # default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString. # pkix : PrintableString, BMPString.
# utf8only: only UTF8Strings. # utf8only: only UTF8Strings.
@@ -117,7 +109,7 @@ organizationName_default = Linux strongSwan
#1.organizationalUnitName = Type (eg, Staff) #1.organizationalUnitName = Type (eg, Staff)
#1.organizationalUnitName_default = Staff #1.organizationalUnitName_default = Staff
#userId = UID #userId = UID
commonName = Common Name (eg, YOUR name) commonName = Common Name (eg, YOUR name)
commonName_default = $ENV::COMMON_NAME commonName_default = $ENV::COMMON_NAME
@@ -154,7 +146,7 @@ basicConstraints = CA:FALSE
keyUsage = digitalSignature, keyEncipherment, keyAgreement keyUsage = digitalSignature, keyEncipherment, keyAgreement
subjectKeyIdentifier = hash subjectKeyIdentifier = hash
authorityKeyIdentifier = keyid, issuer:always authorityKeyIdentifier = keyid, issuer:always
subjectAltName = email:$ENV::COMMON_NAME subjectAltName = email:$ENV::COMMON_NAME
#################################################################### ####################################################################
testing/hosts/winnetou/etc/openssl/ecdsa/openssl.cnf
+7 -15
View File
@@ -1,19 +1,11 @@
# openssl.cnf - OpenSSL configuration file for the ZHW PKI # openssl.cnf - OpenSSL configuration file
# Mario Strasser <[email protected]> #
#
# This definitions were set by the ca_init script DO NOT change # This definitions were set by the ca_init script DO NOT change
# them manually. # them manually.
CAHOME = /etc/openssl/ecdsa CAHOME = /etc/openssl/ecdsa
RANDFILE = $CAHOME/.rand RANDFILE = $CAHOME/.rand
# Extra OBJECT IDENTIFIER info:
oid_section = new_oids
[ new_oids ]
SmartcardLogin = 1.3.6.1.4.1.311.20.2
ClientAuthentication = 1.3.6.1.4.1.311.20.2.2
#################################################################### ####################################################################
[ ca ] [ ca ]
@@ -21,7 +13,7 @@ default_ca = root_ca # The default ca section
#################################################################### ####################################################################
[ root_ca ] [ root_ca ]
dir = $CAHOME dir = $CAHOME
certs = $dir/certs # Where the issued certs are kept certs = $dir/certs # Where the issued certs are kept
@@ -83,7 +75,7 @@ x509_extensions = ca_ext # The extensions to add to the self signed cert
# req_extensions = v3_req # The extensions to add to a certificate request # req_extensions = v3_req # The extensions to add to a certificate request
# This sets a mask for permitted string types. There are several options. # This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString. # default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString. # pkix : PrintableString, BMPString.
# utf8only: only UTF8Strings. # utf8only: only UTF8Strings.
@@ -118,7 +110,7 @@ organizationName_default = Linux strongSwan
#1.organizationalUnitName = Type (eg, Staff) #1.organizationalUnitName = Type (eg, Staff)
#1.organizationalUnitName_default = Staff #1.organizationalUnitName_default = Staff
#userId = UID #userId = UID
commonName = Common Name (eg, YOUR name) commonName = Common Name (eg, YOUR name)
commonName_default = $ENV::COMMON_NAME commonName_default = $ENV::COMMON_NAME
@@ -156,7 +148,7 @@ basicConstraints = CA:FALSE
keyUsage = digitalSignature, keyEncipherment, keyAgreement keyUsage = digitalSignature, keyEncipherment, keyAgreement
subjectKeyIdentifier = hash subjectKeyIdentifier = hash
authorityKeyIdentifier = keyid, issuer:always authorityKeyIdentifier = keyid, issuer:always
subjectAltName = email:$ENV::COMMON_NAME subjectAltName = email:$ENV::COMMON_NAME
#authorityInfoAccess = OCSP;URI:http://ocsp.strongswan.org:8880 #authorityInfoAccess = OCSP;URI:http://ocsp.strongswan.org:8880
crlDistributionPoints = URI:http://crl.strongswan.org/strongswan_ec.crl crlDistributionPoints = URI:http://crl.strongswan.org/strongswan_ec.crl
testing/hosts/winnetou/etc/openssl/monster/openssl.cnf
+6 -14
View File
@@ -1,19 +1,11 @@
# openssl.cnf - OpenSSL configuration file for the ZHW PKI # openssl.cnf - OpenSSL configuration file
# Mario Strasser <[email protected]> #
#
# This definitions were set by the ca_init script DO NOT change # This definitions were set by the ca_init script DO NOT change
# them manually. # them manually.
CAHOME = /etc/openssl/monster CAHOME = /etc/openssl/monster
RANDFILE = $CAHOME/.rand RANDFILE = $CAHOME/.rand
# Extra OBJECT IDENTIFIER info:
oid_section = new_oids
[ new_oids ]
SmartcardLogin = 1.3.6.1.4.1.311.20.2
ClientAuthentication = 1.3.6.1.4.1.311.20.2.2
#################################################################### ####################################################################
[ ca ] [ ca ]
@@ -21,7 +13,7 @@ default_ca = root_ca # The default ca section
#################################################################### ####################################################################
[ root_ca ] [ root_ca ]
dir = $CAHOME dir = $CAHOME
certs = $dir/certs # Where the issued certs are kept certs = $dir/certs # Where the issued certs are kept
@@ -83,7 +75,7 @@ x509_extensions = ca_ext # The extensions to add to the self signed cert
# req_extensions = v3_req # The extensions to add to a certificate request # req_extensions = v3_req # The extensions to add to a certificate request
# This sets a mask for permitted string types. There are several options. # This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString. # default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString. # pkix : PrintableString, BMPString.
# utf8only: only UTF8Strings. # utf8only: only UTF8Strings.
@@ -118,7 +110,7 @@ organizationName_default = Linux strongSwan
#1.organizationalUnitName = Type (eg, Staff) #1.organizationalUnitName = Type (eg, Staff)
#1.organizationalUnitName_default = Staff #1.organizationalUnitName_default = Staff
#userId = UID #userId = UID
commonName = Common Name (eg, YOUR name) commonName = Common Name (eg, YOUR name)
commonName_default = $ENV::COMMON_NAME commonName_default = $ENV::COMMON_NAME
@@ -156,7 +148,7 @@ basicConstraints = CA:FALSE
keyUsage = digitalSignature, keyEncipherment, keyAgreement keyUsage = digitalSignature, keyEncipherment, keyAgreement
subjectKeyIdentifier = hash subjectKeyIdentifier = hash
authorityKeyIdentifier = keyid, issuer:always authorityKeyIdentifier = keyid, issuer:always
subjectAltName = email:$ENV::COMMON_NAME subjectAltName = email:$ENV::COMMON_NAME
#authorityInfoAccess = OCSP;URI:http://ocsp.strongswan.org:8880 #authorityInfoAccess = OCSP;URI:http://ocsp.strongswan.org:8880
crlDistributionPoints = URI:http://crl.strongswan.org/strongswan-monster.crl crlDistributionPoints = URI:http://crl.strongswan.org/strongswan-monster.crl
testing/hosts/winnetou/etc/openssl/openssl.cnf
+7 -15
View File
@@ -1,19 +1,11 @@
# openssl.cnf - OpenSSL configuration file for the ZHW PKI # openssl.cnf - OpenSSL configuration file
# Mario Strasser <[email protected]> #
#
# This definitions were set by the ca_init script DO NOT change # This definitions were set by the ca_init script DO NOT change
# them manually. # them manually.
CAHOME = /etc/openssl CAHOME = /etc/openssl
RANDFILE = $CAHOME/.rand RANDFILE = $CAHOME/.rand
# Extra OBJECT IDENTIFIER info:
oid_section = new_oids
[ new_oids ]
SmartcardLogin = 1.3.6.1.4.1.311.20.2
ClientAuthentication = 1.3.6.1.4.1.311.20.2.2
#################################################################### ####################################################################
[ ca ] [ ca ]
@@ -21,7 +13,7 @@ default_ca = root_ca # The default ca section
#################################################################### ####################################################################
[ root_ca ] [ root_ca ]
dir = $CAHOME dir = $CAHOME
certs = $dir/certs # Where the issued certs are kept certs = $dir/certs # Where the issued certs are kept
@@ -83,7 +75,7 @@ x509_extensions = ca_ext # The extensions to add to the self signed cert
# req_extensions = v3_req # The extensions to add to a certificate request # req_extensions = v3_req # The extensions to add to a certificate request
# This sets a mask for permitted string types. There are several options. # This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString. # default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString. # pkix : PrintableString, BMPString.
# utf8only: only UTF8Strings. # utf8only: only UTF8Strings.
@@ -118,7 +110,7 @@ organizationName_default = Linux strongSwan
#1.organizationalUnitName = Type (eg, Staff) #1.organizationalUnitName = Type (eg, Staff)
#1.organizationalUnitName_default = Staff #1.organizationalUnitName_default = Staff
#userId = UID #userId = UID
commonName = Common Name (eg, YOUR name) commonName = Common Name (eg, YOUR name)
commonName_default = $ENV::COMMON_NAME commonName_default = $ENV::COMMON_NAME
@@ -157,7 +149,7 @@ basicConstraints = CA:FALSE
keyUsage = digitalSignature, keyEncipherment, keyAgreement keyUsage = digitalSignature, keyEncipherment, keyAgreement
subjectKeyIdentifier = hash subjectKeyIdentifier = hash
authorityKeyIdentifier = keyid, issuer:always authorityKeyIdentifier = keyid, issuer:always
subjectAltName = email:$ENV::COMMON_NAME subjectAltName = email:$ENV::COMMON_NAME
#authorityInfoAccess = OCSP;URI:http://ocsp.strongswan.org:8880 #authorityInfoAccess = OCSP;URI:http://ocsp.strongswan.org:8880
crlDistributionPoints = URI:http://crl.strongswan.org/strongswan.crl crlDistributionPoints = URI:http://crl.strongswan.org/strongswan.crl
testing/hosts/winnetou/etc/openssl/research/openssl.cnf
+6 -14
View File
@@ -1,19 +1,11 @@
# openssl.cnf - OpenSSL configuration file for the ZHW PKI # openssl.cnf - OpenSSL configuration file
# Mario Strasser <[email protected]> #
#
# This definitions were set by the ca_init script DO NOT change # This definitions were set by the ca_init script DO NOT change
# them manually. # them manually.
CAHOME = /etc/openssl/research CAHOME = /etc/openssl/research
RANDFILE = $CAHOME/.rand RANDFILE = $CAHOME/.rand
# Extra OBJECT IDENTIFIER info:
oid_section = new_oids
[ new_oids ]
SmartcardLogin = 1.3.6.1.4.1.311.20.2
ClientAuthentication = 1.3.6.1.4.1.311.20.2.2
#################################################################### ####################################################################
[ ca ] [ ca ]
@@ -21,7 +13,7 @@ default_ca = root_ca # The default ca section
#################################################################### ####################################################################
[ root_ca ] [ root_ca ]
dir = $CAHOME dir = $CAHOME
certs = $dir/certs # Where the issued certs are kept certs = $dir/certs # Where the issued certs are kept
@@ -82,7 +74,7 @@ x509_extensions = ca_ext # The extensions to add to the self signed cert
# req_extensions = v3_req # The extensions to add to a certificate request # req_extensions = v3_req # The extensions to add to a certificate request
# This sets a mask for permitted string types. There are several options. # This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString. # default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString. # pkix : PrintableString, BMPString.
# utf8only: only UTF8Strings. # utf8only: only UTF8Strings.
@@ -117,7 +109,7 @@ organizationName_default = Linux strongSwan
#1.organizationalUnitName = Type (eg, Staff) #1.organizationalUnitName = Type (eg, Staff)
#1.organizationalUnitName_default = Staff #1.organizationalUnitName_default = Staff
#userId = UID #userId = UID
commonName = Common Name (eg, YOUR name) commonName = Common Name (eg, YOUR name)
commonName_default = $ENV::COMMON_NAME commonName_default = $ENV::COMMON_NAME
@@ -155,7 +147,7 @@ basicConstraints = CA:FALSE
keyUsage = digitalSignature, keyEncipherment, keyAgreement keyUsage = digitalSignature, keyEncipherment, keyAgreement
subjectKeyIdentifier = hash subjectKeyIdentifier = hash
authorityKeyIdentifier = keyid, issuer:always authorityKeyIdentifier = keyid, issuer:always
subjectAltName = email:$ENV::COMMON_NAME subjectAltName = email:$ENV::COMMON_NAME
crlDistributionPoints = URI:http://crl.strongswan.org/research.crl crlDistributionPoints = URI:http://crl.strongswan.org/research.crl
#################################################################### ####################################################################
testing/hosts/winnetou/etc/openssl/rfc3779/openssl.cnf
+8 -16
View File
@@ -1,19 +1,11 @@
# openssl.cnf - OpenSSL configuration file for the ZHW PKI # openssl.cnf - OpenSSL configuration file
# Mario Strasser <[email protected]> #
#
# This definitions were set by the ca_init script DO NOT change # This definitions were set by the ca_init script DO NOT change
# them manually. # them manually.
CAHOME = /etc/openssl/rfc3779 CAHOME = /etc/openssl/rfc3779
RANDFILE = $CAHOME/.rand RANDFILE = $CAHOME/.rand
# Extra OBJECT IDENTIFIER info:
oid_section = new_oids
[ new_oids ]
SmartcardLogin = 1.3.6.1.4.1.311.20.2
ClientAuthentication = 1.3.6.1.4.1.311.20.2.2
#################################################################### ####################################################################
[ ca ] [ ca ]
@@ -21,7 +13,7 @@ default_ca = root_ca # The default ca section
#################################################################### ####################################################################
[ root_ca ] [ root_ca ]
dir = $CAHOME dir = $CAHOME
certs = $dir/certs # Where the issued certs are kept certs = $dir/certs # Where the issued certs are kept
@@ -83,7 +75,7 @@ x509_extensions = ca_ext # The extensions to add to the self signed cert
# req_extensions = v3_req # The extensions to add to a certificate request # req_extensions = v3_req # The extensions to add to a certificate request
# This sets a mask for permitted string types. There are several options. # This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString. # default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString. # pkix : PrintableString, BMPString.
# utf8only: only UTF8Strings. # utf8only: only UTF8Strings.
@@ -113,12 +105,12 @@ organizationName = Organization Name (eg, company)
organizationName_default = Linux strongSwan organizationName_default = Linux strongSwan
0.organizationalUnitName = Organizational Unit Name (eg, section) 0.organizationalUnitName = Organizational Unit Name (eg, section)
0.organizationalUnitName_default = RFC3779 0.organizationalUnitName_default = RFC3779
#1.organizationalUnitName = Type (eg, Staff) #1.organizationalUnitName = Type (eg, Staff)
#1.organizationalUnitName_default = Staff #1.organizationalUnitName_default = Staff
#userId = UID #userId = UID
commonName = Common Name (eg, YOUR name) commonName = Common Name (eg, YOUR name)
commonName_default = $ENV::COMMON_NAME commonName_default = $ENV::COMMON_NAME
@@ -173,7 +165,7 @@ basicConstraints = CA:FALSE
keyUsage = digitalSignature, keyEncipherment, keyAgreement keyUsage = digitalSignature, keyEncipherment, keyAgreement
subjectKeyIdentifier = hash subjectKeyIdentifier = hash
authorityKeyIdentifier = keyid, issuer:always authorityKeyIdentifier = keyid, issuer:always
subjectAltName = email:$ENV::COMMON_NAME subjectAltName = email:$ENV::COMMON_NAME
#authorityInfoAccess = OCSP;URI:http://ocsp.strongswan.org:8880 #authorityInfoAccess = OCSP;URI:http://ocsp.strongswan.org:8880
crlDistributionPoints = URI:http://crl.strongswan.org/strongswan_rfc3779.crl crlDistributionPoints = URI:http://crl.strongswan.org/strongswan_rfc3779.crl
testing/hosts/winnetou/etc/openssl/sales/openssl.cnf
+7 -15
View File
@@ -1,19 +1,11 @@
# openssl.cnf - OpenSSL configuration file for the ZHW PKI # openssl.cnf - OpenSSL configuration file
# Mario Strasser <[email protected]> #
#
# This definitions were set by the ca_init script DO NOT change # This definitions were set by the ca_init script DO NOT change
# them manually. # them manually.
CAHOME = /etc/openssl/sales CAHOME = /etc/openssl/sales
RANDFILE = $CAHOME/.rand RANDFILE = $CAHOME/.rand
# Extra OBJECT IDENTIFIER info:
oid_section = new_oids
[ new_oids ]
SmartcardLogin = 1.3.6.1.4.1.311.20.2
ClientAuthentication = 1.3.6.1.4.1.311.20.2.2
#################################################################### ####################################################################
[ ca ] [ ca ]
@@ -21,7 +13,7 @@ default_ca = root_ca # The default ca section
#################################################################### ####################################################################
[ root_ca ] [ root_ca ]
dir = $CAHOME dir = $CAHOME
certs = $dir/certs # Where the issued certs are kept certs = $dir/certs # Where the issued certs are kept
@@ -82,7 +74,7 @@ x509_extensions = ca_ext # The extensions to add to the self signed cert
# req_extensions = v3_req # The extensions to add to a certificate request # req_extensions = v3_req # The extensions to add to a certificate request
# This sets a mask for permitted string types. There are several options. # This sets a mask for permitted string types. There are several options.
# default: PrintableString, T61String, BMPString. # default: PrintableString, T61String, BMPString.
# pkix : PrintableString, BMPString. # pkix : PrintableString, BMPString.
# utf8only: only UTF8Strings. # utf8only: only UTF8Strings.
@@ -117,7 +109,7 @@ organizationName_default = Linux strongSwan
#1.organizationalUnitName = Type (eg, Staff) #1.organizationalUnitName = Type (eg, Staff)
#1.organizationalUnitName_default = Staff #1.organizationalUnitName_default = Staff
#userId = UID #userId = UID
commonName = Common Name (eg, YOUR name) commonName = Common Name (eg, YOUR name)
commonName_default = $ENV::COMMON_NAME commonName_default = $ENV::COMMON_NAME
@@ -155,7 +147,7 @@ basicConstraints = CA:FALSE
keyUsage = digitalSignature, keyEncipherment, keyAgreement keyUsage = digitalSignature, keyEncipherment, keyAgreement
subjectKeyIdentifier = hash subjectKeyIdentifier = hash
authorityKeyIdentifier = keyid, issuer:always authorityKeyIdentifier = keyid, issuer:always
subjectAltName = email:$ENV::COMMON_NAME subjectAltName = email:$ENV::COMMON_NAME
crlDistributionPoints = URI:http://crl.strongswan.org/sales.crl crlDistributionPoints = URI:http://crl.strongswan.org/sales.crl
#authorityInfoAccess = OCSP;URI:http://ocsp2.strongswan.org:8882 #authorityInfoAccess = OCSP;URI:http://ocsp2.strongswan.org:8882