# HG changeset patch
# User Sebastien Decugis <sdecugis@nict.go.jp>
# Date 1271999610 -32400
# Node ID 17739001c00ea9b70f288df92068db1b0460ee92
# Parent  0941db40bcba080f12058bdd9118d0ff2e10f8bf# Parent  c8e57b3ca75f1a69b7493fa1d7dd635e324d7e52
Merged change

diff -r 0941db40bcba -r 17739001c00e contrib/ca_script2/Makefile
--- a/contrib/ca_script2/Makefile	Fri Apr 23 14:10:14 2010 +0900
+++ b/contrib/ca_script2/Makefile	Fri Apr 23 14:13:30 2010 +0900
@@ -68,8 +68,8 @@
 	# Create the folder hierarchy
 	@$(REMAKE) structure caname=$(topca)
 	# Generate the self-signed certificate
-	@CA_ROOT_DIR=$(DATA_DIR)/$(topca) openssl req $(CONFIG) -new -batch -x509 -nodes -newkey rsa:$(cakeysize) -out $(DATA_DIR)/$(topca)/public/cacert.pem \
-		-keyout $(DATA_DIR)/$(topca)/private/cakey.pem -subj /CN=$(topca)
+	@CA_ROOT_DIR=$(DATA_DIR)/$(topca) openssl req $(CONFIG) -new -batch -x509 -days 3650 -nodes -newkey rsa:$(cakeysize) -out $(DATA_DIR)/$(topca)/public/cacert.pem \
+		-keyout $(DATA_DIR)/$(topca)/private/cakey.pem -extensions ca_cert -subj /CN=$(topca)
 	@ln -s cacert.pem $(DATA_DIR)/$(topca)/public/`openssl x509 -noout -hash < $(DATA_DIR)/$(topca)/public/cacert.pem`.0
 	@touch $(DATA_DIR)/$(topca)/public/cachain.pem
 	@ln -s ../../$(topca)/public/cacert.pem $(DATA_DIR)/$(topca)/public/caroot.pem