0b60265 Fix picky openssl. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix picky openssl.

Keve committed 1 year ago

commit 0b6026583fc981f5254e165a9ca72e66885b5c1e
parent 889d250

3 files changed +13 -6

modified tests/frontend/fingerprint.sh

@@ -18,16 +18,17 @@ setup() {

 		atf_skip_on Linux Test fails on Linux
 		atf_check -o save:repo.pub -e ignore \
 			pkg key --create repo.key
 		keyform=""
 		_typecmd=""
 		;;
 	ecc)
 		atf_skip_on Darwin Test fails on Darwin
 		atf_skip_on Linux Test fails on Linux
 		atf_check -o ignore -e ignore \
 			openssl ecparam -genkey -name secp256k1 -out repo.key -outform DER
 		chmod 0400 repo.key
 		atf_check -o ignore -e ignore \
 			openssl ec -in repo.key -pubout -out repo.pub -outform DER
 			openssl ec -inform DER -in repo.key -pubout -out repo.pub -outform DER
 		keyform="-keyform DER"
 		_typecmd='printf "%s\n%s\n" "TYPE" "ecdsa"'
 		;;
 	esac

@@ -47,7 +48,7 @@ read -t 2 sum

 $_typecmd
 echo SIGNATURE
 echo -n \$sum | /usr/bin/openssl dgst -sign repo.key -sha256 -binary
 echo -n \$sum | openssl dgst $keyform -sign repo.key -sha256 -binary
 echo
 echo CERT
 cat repo.pub

modified tests/frontend/key.sh

@@ -69,11 +69,17 @@ key_sign_body() {

 		# Generate a key with pkg
 		atf_check -o save:repo.pub -e ignore \
 		    pkg key --create -t "$signer" repo.key
 		atf_check -o save:msg.sig \
 		    pkg key --sign -t "$signer" repo.key < msg
 		atf_check -o ignore openssl dgst -sha256 -verify repo.pub \
 		if [ $signer = ecdsa ]; then
 			keyform="-keyform DER"
 		else
 			keyform=""
 		fi
 		atf_check -o ignore openssl dgst -sha256 $keyform -verify repo.pub \
 		    -signature msg.sig msg
 	done
 }

modified tests/frontend/pubkey.sh

@@ -25,7 +25,7 @@ ecc_test() {

 			openssl ecparam -genkey -name secp256k1 -out repo.key -outform DER
 		chmod 0400 repo.key
 		atf_check -o ignore -e ignore \
 			openssl ec -in repo.key -pubout -out repo.pub -outform DER
 			openssl ec -inform DER -in repo.key -pubout -out repo.pub -outform DER
 		;;
 	esac