changeset 150:994f14da7776

Improve
author Sebastien Decugis <sdecugis@nict.go.jp>
date Tue, 22 Dec 2009 14:10:33 +0900
parents f89c096d6baf
children e36b368fe4da
files contrib/ca_script2/Makefile contrib/ca_script2/openssl.cnf
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/ca_script2/Makefile	Tue Dec 22 14:08:43 2009 +0900
+++ b/contrib/ca_script2/Makefile	Tue Dec 22 14:10:33 2009 +0900
@@ -149,9 +149,8 @@
 gencrl:
 	@if [ -z "$(ca)" ]; then echo "Missing parameter. Ex: make gencrl ca=ca.testbed.aaa"; exit 1; fi
 	# Create the CRL
-	@rm -f $(DATA_DIR)/$(ca)/public/crl/local.pem
 	@CA_ROOT_DIR=$(DATA_DIR)/$(ca) openssl ca $(CONFIG) -gencrl -out $(DATA_DIR)/$(ca)/public/crl/$(ca).pem
-	@ln -s $(ca).pem $(DATA_DIR)/$(ca)/public/crl/local.pem
-	@ln -s crl/$(ca).pem $(DATA_DIR)/$(ca)/public/`openssl crl -noout -hash < $(DATA_DIR)/$(ca)/public/crl/$(ca).pem`.r0
+	@ln -s crl/$(ca).pem $(DATA_DIR)/$(ca)/public/local.pem
+	@ln -s local.pem $(DATA_DIR)/$(ca)/public/`openssl crl -noout -hash < $(DATA_DIR)/$(ca)/public/crl/$(ca).pem`.r0
 
 # End of file...
--- a/contrib/ca_script2/openssl.cnf	Tue Dec 22 14:08:43 2009 +0900
+++ b/contrib/ca_script2/openssl.cnf	Tue Dec 22 14:10:33 2009 +0900
@@ -60,7 +60,7 @@
 
 dir		= $ENV::CA_ROOT_DIR	# Where everything is kept
 certs		= $dir/public		# Where the issued certs are kept
-crl_dir		= $dir/public/crl	# Where the issued crl are kept
+crl_dir		= $dir/public		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
 #unique_subject	= no			# Set to 'no' to allow creation of
 					# several ctificates with same subject.
@@ -69,7 +69,7 @@
 certificate	= $dir/public/cacert.pem 	# The CA certificate
 serial		= $dir/serial 		# The current serial number
 crlnumber	= $dir/crlnumber	# the current crl number
-crl		= $dir/public/crl/local.pem 		# The current CRL
+crl		= $dir/public/local.pem 		# The current CRL
 private_key	= $dir/private/cakey.pem	# The private key
 x509_extensions	= usr_cert		# The extentions to add to the cert
 					# overwrite with -extensions
"Welcome to our mercurial repository"