--- openssl.cnf.orig	2013-06-17 18:15:02.000000000 +0700
+++ openssl.cnf	2014-01-16 22:40:00.000000000 +0700
@@ -35,7 +35,7 @@
 ####################################################################
 [ CA_default ]
 
-dir		= ./demoCA		# Where everything is kept
+dir		= .			# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
@@ -79,10 +79,10 @@
 # For the CA policy
 [ policy_match ]
 countryName		= match
-stateOrProvinceName	= match
+stateOrProvinceName	= optional
 organizationName	= match
-organizationalUnitName	= optional
-commonName		= supplied
+organizationalUnitName	= match
+commonName		= optional
 emailAddress		= optional
 
 # For the 'anything' policy