version 2.1_beta1

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@581 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 3 insertions, 15 deletions

diff --git a/easy-rsa/build-key-server b/easy-rsa/build-key-server
index 30dc41e..5502675 100755
--- a/easy-rsa/build-key-server
+++ b/easy-rsa/build-key-server
@@ -1,22 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
-#
 # Make a certificate/private key pair using a locally generated
 # root certificate.
 #
 # Explicitly set nsCertType to server using the "server"
 # extension in the openssl.cnf file.
 
-if test $# -ne 1; then
-        echo "usage: build-key-server <name>";
-        exit 1
-fi                                                                             
-
-if test $KEY_DIR; then
-	cd $KEY_DIR && \
-	openssl req -days 3650 -nodes -new -keyout $1.key -out $1.csr -extensions server -config $KEY_CONFIG && \
-	openssl ca -days 3650 -out $1.crt -in $1.csr -extensions server -config $KEY_CONFIG && \
-        chmod 0600 $1.key
-else
-	echo you must define KEY_DIR
-fi
+export EASY_RSA="${EASY_RSA:-.}"
+"$EASY_RSA/pkitool" --interact --server $*