Changeset 147:de0f9f43d659 in freeDiameter for contrib

Timestamp:

Dec 22, 2009, 1:49:54 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix, bis

Location:

contrib/ca_script2

Files:

• Makefile (modified) (2 diffs)
• openssl.cnf (modified) (2 diffs)

contrib/ca_script2/Makefile

@@ -103 +103 @@
         @cat $(DATA_DIR)/$(ca)/public/cachain.pem $(DATA_DIR)/$(name)/public/cacert.pem > $(DATA_DIR)/$(name)/public/cachain.pem
         @ln -s ../../$(ca)/public/caroot.pem $(DATA_DIR)/$(name)/public/caroot.pem
-        @for CRL in `cd $(DATA_DIR)/$(ca)/public/crl && ls -1`; do ln -sf ../../../$(ca)/public/crl/$(CRL) $(DATA_DIR)/$(name)/public/crl/$(CRL); done
+        @for CRLFILE in `cd $(DATA_DIR)/$(ca)/public/crl && ls -1`; do ln -sf ../../../$(ca)/public/crl/$(CRLFILE) $(DATA_DIR)/$(name)/public/crl/$(CRLFILE); done
         @$(REMAKE) gencrl ca=$(name)
 
@@ -149 +149 @@
 gencrl:
         @if [ -z "$(ca)" ]; then echo "Missing parameter. Ex: make gencrl ca=ca.testbed.aaa"; exit 1; fi
-        # Create the CRL (keep the old one?)
+        # 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 crl.pem $(DATA_DIR)/$(ca)/public/`openssl crl -noout -hash < $(DATA_DIR)/$(ca)/public/crl/$(ca).pem`.r0
+        @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
 
 # End of file...

contrib/ca_script2/openssl.cnf

@@ -61 +61 @@
 dir             = $ENV::CA_ROOT_DIR     # Where everything is kept
 certs           = $dir/public           # Where the issued certs are kept
-crl_dir         = $dir/public           # Where the issued crl are kept
+crl_dir         = $dir/public/crl       # Where the issued crl are kept
 database        = $dir/index.txt        # database index file.
 #unique_subject = no                    # Set to 'no' to allow creation of
@@ -70 +70 @@
 serial          = $dir/serial           # The current serial number
 crlnumber       = $dir/crlnumber        # the current crl number
-crl             = $dir/public/crl.pem           # The current CRL
+crl             = $dir/public/crl/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