1 --- a/easy-rsa/2.0/build-ca
2 +++ b/easy-rsa/2.0/build-ca
6 export EASY_RSA="${EASY_RSA:-.}"
7 -"$EASY_RSA/pkitool" --interact --initca $*
8 +"/usr/sbin/pkitool" --interact --initca $*
9 --- a/easy-rsa/2.0/build-dh
10 +++ b/easy-rsa/2.0/build-dh
16 # Build Diffie-Hellman parameters for the server side
17 # of an SSL/TLS connection.
19 --- a/easy-rsa/2.0/build-inter
20 +++ b/easy-rsa/2.0/build-inter
24 export EASY_RSA="${EASY_RSA:-.}"
25 -"$EASY_RSA/pkitool" --interact --inter $*
26 +"/usr/sbin/pkitool" --interact --inter $*
27 --- a/easy-rsa/2.0/build-key
28 +++ b/easy-rsa/2.0/build-key
32 export EASY_RSA="${EASY_RSA:-.}"
33 -"$EASY_RSA/pkitool" --interact $*
34 +"/usr/sbin/pkitool" --interact $*
35 --- a/easy-rsa/2.0/build-key-pass
36 +++ b/easy-rsa/2.0/build-key-pass
40 export EASY_RSA="${EASY_RSA:-.}"
41 -"$EASY_RSA/pkitool" --interact --pass $*
42 +"/usr/sbin/pkitool" --interact --pass $*
43 --- a/easy-rsa/2.0/build-key-pkcs12
44 +++ b/easy-rsa/2.0/build-key-pkcs12
46 # the CA certificate as well.
48 export EASY_RSA="${EASY_RSA:-.}"
49 -"$EASY_RSA/pkitool" --interact --pkcs12 $*
50 +"/usr/sbin/pkitool" --interact --pkcs12 $*
51 --- a/easy-rsa/2.0/build-key-server
52 +++ b/easy-rsa/2.0/build-key-server
54 # extension in the openssl.cnf file.
56 export EASY_RSA="${EASY_RSA:-.}"
57 -"$EASY_RSA/pkitool" --interact --server $*
58 +"/usr/sbin/pkitool" --interact --server $*
59 --- a/easy-rsa/2.0/build-req
60 +++ b/easy-rsa/2.0/build-req
62 # when your root certificate and key is not available locally.
64 export EASY_RSA="${EASY_RSA:-.}"
65 -"$EASY_RSA/pkitool" --interact --csr $*
66 +"/usr/sbin/pkitool" --interact --csr $*
67 --- a/easy-rsa/2.0/build-req-pass
68 +++ b/easy-rsa/2.0/build-req-pass
72 export EASY_RSA="${EASY_RSA:-.}"
73 -"$EASY_RSA/pkitool" --interact --csr --pass $*
74 +"/usr/sbin/pkitool" --interact --csr --pass $*
75 --- a/easy-rsa/2.0/clean-all
76 +++ b/easy-rsa/2.0/clean-all
82 # Initialize the $KEY_DIR directory.
83 # Note that this script does a
84 # rm -rf on $KEY_DIR so be careful!
85 --- a/easy-rsa/2.0/inherit-inter
86 +++ b/easy-rsa/2.0/inherit-inter
92 # Build a new PKI which is rooted on an intermediate certificate generated
93 # by ./build-inter or ./pkitool --inter from a parent PKI. The new PKI should
94 # have independent vars settings, and must use a different KEY_DIR directory
95 --- a/easy-rsa/2.0/list-crl
96 +++ b/easy-rsa/2.0/list-crl
100 +. /etc/easy-rsa/vars
102 # list revoked certificates
105 --- a/easy-rsa/2.0/pkitool
106 +++ b/easy-rsa/2.0/pkitool
110 +. /etc/easy-rsa/vars
112 # OpenVPN -- An application to securely tunnel IP networks
113 # over a single TCP/UDP port, with support for SSL/TLS-based
114 # session authentication and key exchange,
115 --- a/easy-rsa/2.0/revoke-full
116 +++ b/easy-rsa/2.0/revoke-full
120 +. /etc/easy-rsa/vars
122 # revoke a certificate, regenerate CRL,
123 # and verify revocation
125 --- a/easy-rsa/2.0/sign-req
126 +++ b/easy-rsa/2.0/sign-req
128 # with a local root certificate and key.
130 export EASY_RSA="${EASY_RSA:-.}"
131 -"$EASY_RSA/pkitool" --interact --sign $*
132 +"/usr/sbin/pkitool" --interact --sign $*
133 --- a/easy-rsa/2.0/vars
134 +++ b/easy-rsa/2.0/vars
136 # This variable should point to
137 # the top level of the easy-rsa
139 -export EASY_RSA="`pwd`"
140 +export EASY_RSA="/etc/easy-rsa"
143 # This variable should point to
145 # This variable should point to
146 # the openssl.cnf file included
148 -export KEY_CONFIG=`$EASY_RSA/whichopensslcnf $EASY_RSA`
149 +export KEY_CONFIG=`/usr/sbin/whichopensslcnf $EASY_RSA`
151 # Edit this variable to point to
152 # your soon-to-be-created key