X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=apps%2Fopenssl.cnf;h=dbe8cbefe0eaff39e0abd55754878cd48c7beb18;hb=ae1bb4e572e02ce73d54c05ce18e872c36da2d35;hp=33b0866f436fe775a7fd328f2314cc6564863ac2;hpb=74400f7348c589bf9e7cd17f657c05b25f8758b1;p=openssl.git

diff --git a/apps/openssl.cnf b/apps/openssl.cnf
index 33b0866f43..dbe8cbefe0 100644
--- a/apps/openssl.cnf
+++ b/apps/openssl.cnf
@@ -3,8 +3,13 @@
 # This is mostly being used for generation of certificate requests.
 #
 
+# This definition stops the following lines choking if HOME isn't
+# defined.
+HOME			= .
 RANDFILE		= $ENV::HOME/.rnd
-oid_file		= $ENV::HOME/.oid
+
+# Extra OBJECT IDENTIFIER info:
+#oid_file		= $ENV::HOME/.oid
 oid_section		= new_oids
 
 # To use this configuration file with the "-extfile" option of the
@@ -86,16 +91,19 @@ distinguished_name	= req_distinguished_name
 attributes		= req_attributes
 x509_extensions	= v3_ca	# The extentions to add to the self signed cert
 
-# This sets the permitted types in a DirectoryString. There are several
-# options. 
+# Passwords for private keys if not present they will be prompted for
+# input_password = secret
+# output_password = secret
+
+# This sets a mask for permitted string types. There are several options. 
 # default: PrintableString, T61String, BMPString.
 # pkix	 : PrintableString, BMPString.
 # utf8only: only UTF8Strings.
-# nobmp : PrintableString, T61String (no BMPStrings).
+# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
 # MASK:XXXX a literal mask value.
 # WARNING: current versions of Netscape crash on BMPStrings or UTF8Strings
 # so use this option with caution!
-dirstring_type = nobmp
+string_mask = nombstr
 
 # req_extensions = v3_req # The extensions to add to a certificate request