create_all calls create_some to generate some user certs

diff --git a/bin/generate-test-certificates.sh b/bin/generate-test-certificates.sh
index f750b74..8791f86 100755 (executable)
--- a/bin/generate-test-certificates.sh
+++ b/bin/generate-test-certificates.sh
@@ -316,14 +316,7 @@ function create_all {
     # And also a host cert/key pair.
 
     if [ "$catype" == "trusted" ]; then
-        # Create a user and host certificate
-        create_cert $CERT_DIR/${catype}_client "$LOGNAME" client $DAYS
-        create_cert $CERT_DIR/${catype}_server "$HOSTNAME" server $DAYS
-        # And put them in the stage directory.
-        mv $CERT_DIR/${catype}_client.cert ../../../usercert.pem
-        mv $CERT_DIR/${catype}_client.priv ../../../userkey.pem
-        mv $CERT_DIR/${catype}_server.cert ../../../hostcert.pem
-        mv $CERT_DIR/${catype}_server.priv ../../../hostkey.pem
+        create_some
         rm ${CA_DIR}/serial_proxy.txt; # touch ${CA_DIR}/serial_proxy.txt
     fi
 
@@ -515,30 +508,6 @@ function create_all {
 
 }
 
-function create_all_test {
-
-    # If we have the trusted CA, then generate a user cert/key pair
-    # And also a host cert/key pair.
-
-    if [ "$catype" == "trusted" ]; then
-        # Create a user and host certificate
-        create_cert $CERT_DIR/${catype}_client "$LOGNAME" client $DAYS
-        create_cert $CERT_DIR/${catype}_server "$HOSTNAME" server $DAYS
-        # And put them in the stage directory.
-        mv $CERT_DIR/${catype}_client.cert ../../../usercert.pem
-        mv $CERT_DIR/${catype}_client.priv ../../../userkey.pem
-        mv $CERT_DIR/${catype}_server.cert ../../../hostcert.pem
-        mv $CERT_DIR/${catype}_server.priv ../../../hostkey.pem
-    fi
-
-    # create valid certs with proxies
-    create_cert $CERT_DIR/${catype}_client "$catype client" client $DAYS
-    DAYS=1
-    create_cert_proxy $CERT_DIR/${catype}_client "$catype client" grid_proxy "proxy" $DAYS
-    create_cert_proxy_proxy $CERT_DIR/${catype}_client "$catype client" grid_proxy_proxy "proxy" $DAYS
-
-}
-
 ############################## main ################################
 
 USAGE="$0 [--help] [--all] [--some] [--extra #extra-user-certs]"