From 5fdca53a8d70b621481100998ef863f8eabce2f9 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Mon, 11 Aug 2014 10:53:44 -0400
Subject: Updated cleanup script.

---
 scripts/kra-python-test.sh | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'scripts/kra-python-test.sh')

diff --git a/scripts/kra-python-test.sh b/scripts/kra-python-test.sh
index 403ce26..ba93e8f 100755
--- a/scripts/kra-python-test.sh
+++ b/scripts/kra-python-test.sh
@@ -2,29 +2,27 @@
 
 SRC_DIR=`cd ../.. ; pwd`
 
-INSTANCE_NAME=kra-master
+INSTANCE_NAME=pki-tomcat
 SERVER_CERT_DIR=/var/lib/pki/$INSTANCE_NAME
-CLIENT_CERT_DIR=/var/lib/pki/$INSTANCE_NAME/kra/certs
-CERT_NAME="transportCert cert-$INSTANCE_NAME"
+CLIENT_CERT_DIR=~/.dogtag/$INSTANCE_NAME
+CERT_NAME="transportCert cert-$INSTANCE_NAME KRA"
 
-CLASSPATH=$SRC_DIR/pki/build/classes
-CLASSPATH=$CLASSPATH:/usr/share/java/apache-commons-cli.jar
-CLASSPATH=$CLASSPATH:/usr/lib64/java/jss4.jar
-CLASSPATH=$CLASSPATH:/usr/share/java/commons-codec.jar
+# export admin certificate
+rm -rf /tmp/auth.pem
+openssl pkcs12 -in $CLIENT_CERT_DIR/ca_admin_cert.p12 -out /tmp/auth.pem -nodes -passin pass:Secret123
 
-#echo Secret123 > $CLIENT_CERT_DIR/password.txt
-#certutil -N -d $CLIENT_CERT_DIR -f $CLIENT_CERT_DIR/password.txt
+# create client database
+rm -rf /tmp/drmtest-certdb
+mkdir -p /tmp/drmtest-certdb
+certutil -N -d /tmp/drmtest-certdb -f $CLIENT_CERT_DIR/ca/password.conf
+chmod -R +r /tmp/drmtest-certdb
 
 # export transport certificate
-certutil -L -d $SERVER_CERT_DIR/alias -n "$CERT_NAME" -a > $CLIENT_CERT_DIR/transport.pem
-AtoB $CLIENT_CERT_DIR/transport.pem $CLIENT_CERT_DIR/transport.crt
+#certutil -L -d $SERVER_CERT_DIR/alias -n "$CERT_NAME" -a > transport.pem
 
 # import transport certificate
-certutil -A -d $CLIENT_CERT_DIR -n "$CERT_NAME" -i $CLIENT_CERT_DIR/transport.pem -t u,u,u
-
-# generate options
-java -classpath $CLASSPATH com.netscape.cms.servlet.test.GeneratePKIArchiveOptions -d $CLIENT_CERT_DIR -k $CLIENT_CERT_DIR/symkey.out -o $CLIENT_CERT_DIR/options.out -t $CLIENT_CERT_DIR/transport.crt -w Secret123
+#certutil -A -d /tmp/drmtest-certdb -n "kra transport cert" -i transport.pem -a -t "u,u,u"
 
 # run KRA test
 cd $SRC_DIR/pki/base/kra/functional
-python drmclient.py -d $CLIENT_CERT_DIR --options=options.out --symkey=symkey.out -p 12080 -n "$CERT_NAME"
+python drmtest.py
-- 
cgit