From: Viktor Szakats Date: Fri, 1 Nov 2024 13:59:48 +0000 (+0100) Subject: certs: add missing `-CAcreateserial` option for LibreSSL X-Git-Tag: curl-8_11_0~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d32724c12a06b2d5aae45b3f4f6f2de27f7778d;p=thirdparty%2Fcurl.git certs: add missing `-CAcreateserial` option for LibreSSL Also: - display openssl path and version. - quote a string. Follow-up to 9b0c0d6ade052c46cf72d2fd43017bacb0ba07f6 #15129 Closes #15471 --- diff --git a/tests/certs/scripts/genroot.sh b/tests/certs/scripts/genroot.sh index 2753cdf628..86afb18534 100755 --- a/tests/certs/scripts/genroot.sh +++ b/tests/certs/scripts/genroot.sh @@ -31,6 +31,9 @@ if [ -f /usr/local/ssl/bin/openssl ]; then OPENSSL=/usr/local/ssl/bin/openssl fi +command -v "$OPENSSL" +"$OPENSSL" version + USAGE='echo Usage is genroot.sh ' HOME=$(pwd) diff --git a/tests/certs/scripts/genserv.sh b/tests/certs/scripts/genserv.sh index 16e1034557..73e4978363 100755 --- a/tests/certs/scripts/genserv.sh +++ b/tests/certs/scripts/genserv.sh @@ -31,6 +31,9 @@ if [ -f /usr/local/ssl/bin/openssl ]; then OPENSSL=/usr/local/ssl/bin/openssl fi +command -v "$OPENSSL" +"$OPENSSL" version + USAGE='echo Usage is genserv.sh ' HOME=$(pwd) @@ -60,7 +63,7 @@ fi CAPREFIX="${2:-}" if [ -z "$CAPREFIX" ]; then - echo No CA prefix + echo 'No CA prefix' NOTOK=1 else if [ ! -f "$CAPREFIX-ca.cacert" ]; then @@ -100,7 +103,7 @@ echo 'pseudo secrets generated' "$OPENSSL" rsa -in "$PREFIX-sv.key" -pubout -outform DER -out "$PREFIX-sv.pub.der" "$OPENSSL" rsa -in "$PREFIX-sv.key" -pubout -outform PEM -out "$PREFIX-sv.pub.pem" -"$OPENSSL" x509 -extfile "$PREFIX-sv.prm" -days "$DURATION" -CA "$CAPREFIX-ca.cacert" -CAkey "$CAPREFIX-ca.key" -in "$PREFIX-sv.csr" -req -text -nameopt multiline "$DIGESTALGO" > "$PREFIX-sv.crt" +"$OPENSSL" x509 -extfile "$PREFIX-sv.prm" -days "$DURATION" -CA "$CAPREFIX-ca.cacert" -CAkey "$CAPREFIX-ca.key" -CAcreateserial -in "$PREFIX-sv.csr" -req -text -nameopt multiline "$DIGESTALGO" > "$PREFIX-sv.crt" if [ "$P12" = YES ]; then "$OPENSSL" pkcs12 -export -des3 -out "$PREFIX-sv.p12" -caname "$CAPREFIX" -name "$PREFIX" -inkey "$PREFIX-sv.key" -in "$PREFIX-sv.crt" -certfile "$CAPREFIX-ca.crt"