From 988f5e39a9dd9d22ac8d1575334bc5639557ba2e Mon Sep 17 00:00:00 2001 From: Andy Brody Date: Wed, 22 May 2013 14:30:40 -0700 Subject: [PATCH] Fix up whitespace in 1.0 as well. --- easy-rsa/1.0/build-ca | 8 ++++---- easy-rsa/1.0/build-inter | 14 +++++++------- easy-rsa/1.0/build-key | 16 ++++++++-------- easy-rsa/1.0/build-key-pass | 14 +++++++------- easy-rsa/1.0/build-key-pkcs12 | 18 +++++++++--------- easy-rsa/1.0/build-key-server | 16 ++++++++-------- easy-rsa/1.0/build-req | 2 +- easy-rsa/1.0/build-req-pass | 2 +- easy-rsa/1.0/clean-all | 12 ++++++------ easy-rsa/1.0/list-crl | 10 +++++----- easy-rsa/1.0/make-crl | 10 +++++----- easy-rsa/1.0/revoke-crt | 10 +++++----- easy-rsa/1.0/revoke-full | 26 +++++++++++++------------- easy-rsa/1.0/sign-req | 12 ++++++------ 14 files changed, 85 insertions(+), 85 deletions(-) diff --git a/easy-rsa/1.0/build-ca b/easy-rsa/1.0/build-ca index 5ad59cc..fc51801 100755 --- a/easy-rsa/1.0/build-ca +++ b/easy-rsa/1.0/build-ca @@ -5,9 +5,9 @@ # if test $KEY_DIR; then - cd $KEY_DIR && \ - openssl req -days 3650 -nodes -new -x509 -keyout ca.key -out ca.crt -config $KEY_CONFIG && \ - chmod 0600 ca.key + cd $KEY_DIR && \ + openssl req -days 3650 -nodes -new -x509 -keyout ca.key -out ca.crt -config $KEY_CONFIG && \ + chmod 0600 ca.key else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/build-inter b/easy-rsa/1.0/build-inter index 8b3a6b2..8dc4830 100755 --- a/easy-rsa/1.0/build-inter +++ b/easy-rsa/1.0/build-inter @@ -6,14 +6,14 @@ # if test $# -ne 1; then - echo "usage: build-inter "; - exit 1 -fi + echo "usage: build-inter "; + exit 1 +fi if test $KEY_DIR; then - cd $KEY_DIR && \ - openssl req -days 3650 -nodes -new -keyout $1.key -out $1.csr -config $KEY_CONFIG && \ - openssl ca -extensions v3_ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG + cd $KEY_DIR && \ + openssl req -days 3650 -nodes -new -keyout $1.key -out $1.csr -config $KEY_CONFIG && \ + openssl ca -extensions v3_ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/build-key b/easy-rsa/1.0/build-key index 3159d2b..219f156 100755 --- a/easy-rsa/1.0/build-key +++ b/easy-rsa/1.0/build-key @@ -6,15 +6,15 @@ # if test $# -ne 1; then - echo "usage: build-key "; - exit 1 -fi + echo "usage: build-key "; + exit 1 +fi if test $KEY_DIR; then - cd $KEY_DIR && \ - openssl req -days 3650 -nodes -new -keyout $1.key -out $1.csr -config $KEY_CONFIG && \ - openssl ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG && \ - chmod 0600 $1.key + cd $KEY_DIR && \ + openssl req -days 3650 -nodes -new -keyout $1.key -out $1.csr -config $KEY_CONFIG && \ + openssl ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG && \ + chmod 0600 $1.key else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/build-key-pass b/easy-rsa/1.0/build-key-pass index 03ab304..086b9c8 100755 --- a/easy-rsa/1.0/build-key-pass +++ b/easy-rsa/1.0/build-key-pass @@ -6,15 +6,15 @@ # if test $# -ne 1; then - echo "usage: build-key-pass "; - exit 1 + echo "usage: build-key-pass "; + exit 1 fi if test $KEY_DIR; then - cd $KEY_DIR && \ - openssl req -days 3650 -new -keyout $1.key -out $1.csr -config $KEY_CONFIG && \ - openssl ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG && \ - chmod 0600 $1.key + cd $KEY_DIR && \ + openssl req -days 3650 -new -keyout $1.key -out $1.csr -config $KEY_CONFIG && \ + openssl ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG && \ + chmod 0600 $1.key else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/build-key-pkcs12 b/easy-rsa/1.0/build-key-pkcs12 index f8a057b..28b48af 100755 --- a/easy-rsa/1.0/build-key-pkcs12 +++ b/easy-rsa/1.0/build-key-pkcs12 @@ -6,16 +6,16 @@ # the CA certificate as well. if test $# -ne 1; then - echo "usage: build-key-pkcs12 "; - exit 1 -fi + echo "usage: build-key-pkcs12 "; + exit 1 +fi if test $KEY_DIR; then - cd $KEY_DIR && \ - openssl req -days 3650 -nodes -new -keyout $1.key -out $1.csr -config $KEY_CONFIG && \ - openssl ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG && \ - openssl pkcs12 -export -inkey $1.key -in $1.crt -certfile ca.crt -out $1.p12 && \ - chmod 0600 $1.key $1.p12 + cd $KEY_DIR && \ + openssl req -days 3650 -nodes -new -keyout $1.key -out $1.csr -config $KEY_CONFIG && \ + openssl ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG && \ + openssl pkcs12 -export -inkey $1.key -in $1.crt -certfile ca.crt -out $1.p12 && \ + chmod 0600 $1.key $1.p12 else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/build-key-server b/easy-rsa/1.0/build-key-server index 30dc41e..b65a931 100755 --- a/easy-rsa/1.0/build-key-server +++ b/easy-rsa/1.0/build-key-server @@ -8,15 +8,15 @@ # extension in the openssl.cnf file. if test $# -ne 1; then - echo "usage: build-key-server "; - exit 1 -fi + echo "usage: build-key-server "; + 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 + 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 + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/build-req b/easy-rsa/1.0/build-req index 30f62f5..2530f4d 100755 --- a/easy-rsa/1.0/build-req +++ b/easy-rsa/1.0/build-req @@ -8,7 +8,7 @@ if test $# -ne 1; then echo "usage: build-req "; exit 1 -fi +fi if test $KEY_DIR; then cd $KEY_DIR && \ diff --git a/easy-rsa/1.0/build-req-pass b/easy-rsa/1.0/build-req-pass index 829b286..65742f9 100755 --- a/easy-rsa/1.0/build-req-pass +++ b/easy-rsa/1.0/build-req-pass @@ -8,7 +8,7 @@ if test $# -ne 1; then echo "usage: build-req-pass "; exit 1 -fi +fi if test $KEY_DIR; then cd $KEY_DIR && \ diff --git a/easy-rsa/1.0/clean-all b/easy-rsa/1.0/clean-all index d10aef5..c3cf533 100755 --- a/easy-rsa/1.0/clean-all +++ b/easy-rsa/1.0/clean-all @@ -9,11 +9,11 @@ d=$KEY_DIR if test $d; then - rm -rf $d - mkdir $d && \ - chmod go-rwx $d && \ - touch $d/index.txt && \ - echo 01 >$d/serial + rm -rf $d + mkdir $d && \ + chmod go-rwx $d && \ + touch $d/index.txt && \ + echo 01 >$d/serial else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/list-crl b/easy-rsa/1.0/list-crl index b214dbd..8570fc6 100644 --- a/easy-rsa/1.0/list-crl +++ b/easy-rsa/1.0/list-crl @@ -6,13 +6,13 @@ # if test $# -ne 1; then - echo "usage: list-crl "; - exit 1 + echo "usage: list-crl "; + exit 1 fi if test $KEY_DIR; then - cd $KEY_DIR && \ - openssl crl -text -noout -in $1 + cd $KEY_DIR && \ + openssl crl -text -noout -in $1 else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/make-crl b/easy-rsa/1.0/make-crl index 62fe6c1..6f55027 100644 --- a/easy-rsa/1.0/make-crl +++ b/easy-rsa/1.0/make-crl @@ -6,13 +6,13 @@ # if test $# -ne 1; then - echo "usage: make-crl "; - exit 1 + echo "usage: make-crl "; + exit 1 fi if test $KEY_DIR; then - cd $KEY_DIR && \ - openssl ca -gencrl -out $1 -config $KEY_CONFIG + cd $KEY_DIR && \ + openssl ca -gencrl -out $1 -config $KEY_CONFIG else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/revoke-crt b/easy-rsa/1.0/revoke-crt index 35b071a..0a6fc51 100644 --- a/easy-rsa/1.0/revoke-crt +++ b/easy-rsa/1.0/revoke-crt @@ -6,13 +6,13 @@ # if test $# -ne 1; then - echo "usage: revoke-crt "; - exit 1 + echo "usage: revoke-crt "; + exit 1 fi if test $KEY_DIR; then - cd $KEY_DIR && \ - openssl ca -revoke $1 -config $KEY_CONFIG + cd $KEY_DIR && \ + openssl ca -revoke $1 -config $KEY_CONFIG else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/revoke-full b/easy-rsa/1.0/revoke-full index 66ea03f..be3774f 100755 --- a/easy-rsa/1.0/revoke-full +++ b/easy-rsa/1.0/revoke-full @@ -7,23 +7,23 @@ CRL=crl.pem RT=revoke-test.pem if test $# -ne 1; then - echo "usage: revoke-full "; - exit 1 + echo "usage: revoke-full "; + exit 1 fi if test $KEY_DIR; then - cd $KEY_DIR - rm -f $RT + cd $KEY_DIR + rm -f $RT - # revoke key and generate a new CRL - openssl ca -revoke $1.crt -config $KEY_CONFIG + # revoke key and generate a new CRL + openssl ca -revoke $1.crt -config $KEY_CONFIG - # generate a new CRL - openssl ca -gencrl -out $CRL -config $KEY_CONFIG - cat ca.crt $CRL >$RT - - # verify the revocation - openssl verify -CAfile $RT -crl_check $1.crt + # generate a new CRL + openssl ca -gencrl -out $CRL -config $KEY_CONFIG + cat ca.crt $CRL >$RT + + # verify the revocation + openssl verify -CAfile $RT -crl_check $1.crt else - echo you must define KEY_DIR + echo you must define KEY_DIR fi diff --git a/easy-rsa/1.0/sign-req b/easy-rsa/1.0/sign-req index 59edc42..ecb35a2 100755 --- a/easy-rsa/1.0/sign-req +++ b/easy-rsa/1.0/sign-req @@ -6,13 +6,13 @@ # if test $# -ne 1; then - echo "usage: sign-req "; - exit 1 -fi + echo "usage: sign-req "; + exit 1 +fi if test $KEY_DIR; then - cd $KEY_DIR && \ - openssl ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG + cd $KEY_DIR && \ + openssl ca -days 3650 -out $1.crt -in $1.csr -config $KEY_CONFIG else - echo you must define KEY_DIR + echo you must define KEY_DIR fi