diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-04 00:53:08 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-04 00:53:08 +0000 |
commit | 52d475452f32ee882a7c7034621deb2ced6b4fc4 (patch) | |
tree | f67eec2ac8e9cfc401e8941054de712c2859aa52 /net | |
parent | 8f13defae66da0debef8efbe651024e40958acb9 (diff) | |
download | chromium_src-52d475452f32ee882a7c7034621deb2ced6b4fc4.zip chromium_src-52d475452f32ee882a7c7034621deb2ced6b4fc4.tar.gz chromium_src-52d475452f32ee882a7c7034621deb2ced6b4fc4.tar.bz2 |
test-cert generation scripts: Fix serial number file creation.
Fix quoting in try() function.
Fix places that attempted to use redirection with try() incorrectly.
Serial number must be hex string with length being a multiple of 2.
BUG=none
R=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/141893008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rwxr-xr-x | net/data/ssl/scripts/generate-aia-certs.sh | 6 | ||||
-rwxr-xr-x | net/data/ssl/scripts/generate-bad-eku-certs.sh | 4 | ||||
-rwxr-xr-x | net/data/ssl/scripts/generate-client-certificates.sh | 6 | ||||
-rwxr-xr-x | net/data/ssl/scripts/generate-cross-signed-certs.sh | 6 | ||||
-rwxr-xr-x | net/data/ssl/scripts/generate-duplicate-cn-certs.sh | 14 | ||||
-rwxr-xr-x | net/data/ssl/scripts/generate-policy-certs.sh | 6 | ||||
-rwxr-xr-x | net/data/ssl/scripts/generate-redundant-test-chains.sh | 16 | ||||
-rwxr-xr-x | net/data/ssl/scripts/generate-test-certs.sh | 4 | ||||
-rwxr-xr-x | net/data/ssl/scripts/generate-weak-test-chains.sh | 6 |
9 files changed, 24 insertions, 44 deletions
diff --git a/net/data/ssl/scripts/generate-aia-certs.sh b/net/data/ssl/scripts/generate-aia-certs.sh index 98b858e..a509cde 100755 --- a/net/data/ssl/scripts/generate-aia-certs.sh +++ b/net/data/ssl/scripts/generate-aia-certs.sh @@ -9,15 +9,15 @@ try() { echo "$@" - $@ || exit 1 + "$@" || exit 1 } try rm -rf out try mkdir out # Create the serial number files. -try echo 1 > out/aia-test-root-serial -try echo 1 > out/aia-test-intermediate-serial +try /bin/sh -c "echo 01 > out/aia-test-root-serial" +try /bin/sh -c "echo 01 > out/aia-test-intermediate-serial" # Create the signers' DB files. touch out/aia-test-root-index.txt diff --git a/net/data/ssl/scripts/generate-bad-eku-certs.sh b/net/data/ssl/scripts/generate-bad-eku-certs.sh index 11e41d4..88fc79c 100755 --- a/net/data/ssl/scripts/generate-bad-eku-certs.sh +++ b/net/data/ssl/scripts/generate-bad-eku-certs.sh @@ -11,7 +11,7 @@ try () { echo "$@" - $@ || exit 1 + "$@" || exit 1 } try rm -rf out @@ -20,7 +20,7 @@ try mkdir out eku_test_root="eku-test-root" # Create the serial number files. -try echo 1 > out/$eku_test_root-serial +try /bin/sh -c "echo 01 > out/$eku_test_root-serial" # Make sure the signers' DB files exist. touch out/$eku_test_root-index.txt diff --git a/net/data/ssl/scripts/generate-client-certificates.sh b/net/data/ssl/scripts/generate-client-certificates.sh index 3378299..f1e7fe4 100755 --- a/net/data/ssl/scripts/generate-client-certificates.sh +++ b/net/data/ssl/scripts/generate-client-certificates.sh @@ -20,17 +20,17 @@ try () { echo "$@" - $@ || exit 1 + "$@" || exit 1 } try rm -rf out try mkdir out echo Create the serial number files and indices. -serial = 100 +serial=1000 for i in B C E do - try echo $serial > out/$i-serial + try /bin/sh -c "echo $serial > out/$i-serial" serial=$(expr $serial + 1) touch out/$i-index.txt touch out/$i-index.txt.attr diff --git a/net/data/ssl/scripts/generate-cross-signed-certs.sh b/net/data/ssl/scripts/generate-cross-signed-certs.sh index a40ca74..c9f94d0 100755 --- a/net/data/ssl/scripts/generate-cross-signed-certs.sh +++ b/net/data/ssl/scripts/generate-cross-signed-certs.sh @@ -20,14 +20,14 @@ try() { echo "$@" - $@ || exit 1 + "$@" || exit 1 } try rm -rf out try mkdir out -try echo 1 > out/2048-sha1-root-serial -try echo 2 > out/2048-md5-root-serial +try /bin/sh -c "echo 01 > out/2048-sha1-root-serial" +try /bin/sh -c "echo 02 > out/2048-md5-root-serial" touch out/2048-sha1-root-index.txt touch out/2048-md5-root-index.txt diff --git a/net/data/ssl/scripts/generate-duplicate-cn-certs.sh b/net/data/ssl/scripts/generate-duplicate-cn-certs.sh index 8e48454..a813226 100755 --- a/net/data/ssl/scripts/generate-duplicate-cn-certs.sh +++ b/net/data/ssl/scripts/generate-duplicate-cn-certs.sh @@ -16,24 +16,14 @@ try () { echo "$@" - $@ || exit 1 -} - -generate_key_command () { - case "$1" in - rsa) - echo genrsa - ;; - *) - exit 1 - esac + "$@" || exit 1 } try rm -rf out try mkdir out echo Create the serial number and index files. -try echo 1 > out/B-serial +try /bin/sh -c "echo 01 > out/B-serial" try touch out/B-index.txt echo Generate the keys. diff --git a/net/data/ssl/scripts/generate-policy-certs.sh b/net/data/ssl/scripts/generate-policy-certs.sh index 4a6b35d..6f592308 100755 --- a/net/data/ssl/scripts/generate-policy-certs.sh +++ b/net/data/ssl/scripts/generate-policy-certs.sh @@ -12,15 +12,15 @@ try() { echo "$@" - $@ || exit 1 + "$@" || exit 1 } try rm -rf out try mkdir out # Create the serial number files. -try echo 1 > out/policy-root-serial -try echo 1 > out/policy-intermediate-serial +try /bin/sh -c "echo 01 > out/policy-root-serial" +try /bin/sh -c "echo 01 > out/policy-intermediate-serial" # Create the signers' DB files. touch out/policy-root-index.txt diff --git a/net/data/ssl/scripts/generate-redundant-test-chains.sh b/net/data/ssl/scripts/generate-redundant-test-chains.sh index 58768e8..27e8003 100755 --- a/net/data/ssl/scripts/generate-redundant-test-chains.sh +++ b/net/data/ssl/scripts/generate-redundant-test-chains.sh @@ -21,27 +21,17 @@ try () { echo "$@" - $@ || exit 1 -} - -generate_key_command () { - case "$1" in - rsa) - echo genrsa - ;; - *) - exit 1 - esac + "$@" || exit 1 } try rm -rf out try mkdir out echo Create the serial number files. -serial=100 +serial=1000 for i in B C C2 D do - try echo $serial > out/$i-serial + try /bin/sh -c "echo $serial > out/$i-serial" serial=$(expr $serial + 1) done diff --git a/net/data/ssl/scripts/generate-test-certs.sh b/net/data/ssl/scripts/generate-test-certs.sh index 9cff810..4c13bce 100755 --- a/net/data/ssl/scripts/generate-test-certs.sh +++ b/net/data/ssl/scripts/generate-test-certs.sh @@ -9,13 +9,13 @@ try() { echo "$@" - $@ || exit 1 + "$@" || exit 1 } try rm -rf out try mkdir out -try echo 1 > out/2048-sha1-root-serial +try /bin/sh -c "echo 01 > out/2048-sha1-root-serial" touch out/2048-sha1-root-index.txt # Generate the key diff --git a/net/data/ssl/scripts/generate-weak-test-chains.sh b/net/data/ssl/scripts/generate-weak-test-chains.sh index 845c8ab..c43c62a 100755 --- a/net/data/ssl/scripts/generate-weak-test-chains.sh +++ b/net/data/ssl/scripts/generate-weak-test-chains.sh @@ -11,7 +11,7 @@ key_types="768-rsa 1024-rsa 2048-rsa prime256v1-ecdsa" try () { echo "$@" - $@ || exit 1 + "$@" || exit 1 } generate_key_command () { @@ -34,10 +34,10 @@ try rm -rf out try mkdir out # Create the serial number files. -try echo 1 > out/2048-rsa-root-serial +try /bin/sh -c "echo 01 > out/2048-rsa-root-serial" for key_type in $key_types do - try echo 1 > out/$key_type-intermediate-serial + try /bin/sh -c "echo 01 > out/$key_type-intermediate-serial" done # Generate one root CA certificate. |