--- a/contrib/ca_script/Makefile	Mon Oct 05 17:13:01 2009 +0900
+++ b/contrib/ca_script/Makefile	Mon Oct 05 17:51:06 2009 +0900
@@ -136,7 +136,7 @@
 revoke:
 	@if [ -z "$(name)" ]; then echo "name must be provided: make revoke name=mn.n6.org"; exit 1; fi
 	@if [ ! -e $(DIR)/clients/certs/$(name).cert ]; \
-		echo "$(DIR)/clients/certs/$(name).cert not found"; \
+		then echo "$(DIR)/clients/certs/$(name).cert not found"; \
 		exit 1; \
 		fi;
 	@openssl ca $(CONFIG) -revoke $(DIR)/clients/certs/$(name).cert;

--- a/contrib/ca_script/openssl.cnf	Mon Oct 05 17:13:01 2009 +0900
+++ b/contrib/ca_script/openssl.cnf	Mon Oct 05 17:51:06 2009 +0900
@@ -106,8 +106,8 @@
 x509_extensions	= v3_ca	# The extentions to add to the self signed cert
 
 # Passwords for private keys if not present they will be prompted for
-# input_password = haikusecret
-# output_password = haikusecret
+# input_password = fdsecret
+# output_password = fdsecret
 
 # This sets a mask for permitted string types. There are several options. 
 # default: PrintableString, T61String, BMPString.
@@ -117,7 +117,7 @@
 # MASK:XXXX a literal mask value.
 # WARNING: current versions of Netscape crash on BMPStrings or UTF8Strings
 # so use this option with caution!
-string_mask = nombstr
+string_mask = utf8only
 
 # req_extensions = v3_req # The extensions to add to a certificate request
 
@@ -128,25 +128,25 @@
 countryName_max			= 2
 
 stateOrProvinceName		= State or Province Name (full name)
-stateOrProvinceName_default	= Kanagawa
+stateOrProvinceName_default	= Tokyo
 
 localityName			= Locality Name (eg, city)
-localityName_default		= Shin-Kawasaki
+localityName_default		= Koganei
 
 0.organizationName		= Organization Name (eg, company)
 0.organizationName_default	= WIDE
 
 # we can do this but it is not needed normally :-)
-#1.organizationName		= Second Organization Name (eg, company)
-#1.organizationName_default	= World Wide Web Pty Ltd
+1.organizationName		= Second Organization Name (eg, company)
+1.organizationName_default	= NICT
 
 organizationalUnitName		= Organizational Unit Name (eg, section)
-organizationalUnitName_default	= Nautilus6 WG
+organizationalUnitName_default	= AAA WG
 
-commonName			= Common Name (i.e. Home Agent hostname)
+commonName			= Common Name (i.e. Diameter Agent hostname)
 commonName_max			= 64
 
-emailAddress			= Email Address (i.e. HA administrator)
+emailAddress			= Email Address (i.e. Diameter agent administrator)
 emailAddress_max		= 64
 
 # SET-ex3			= SET extension number 3