From 2a7b386f35cfcd4671ebdda0babfa8369c7ee4d4 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Mon, 11 Oct 2021 13:49:54 +0200 Subject: [PATCH] Remove unused source file --- common.sh | 88 ----------------------------------------------------- opensc.spec | 4 --- 2 files changed, 92 deletions(-) delete mode 100644 common.sh diff --git a/common.sh b/common.sh deleted file mode 100644 index bc9747f..0000000 --- a/common.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash -## from OpenSC/src/tests/p11test/runtest.sh - -SOPIN="12345678" -PIN="123456" -PKCS11_TOOL="../src/tools/pkcs11-tool" - -softhsm_paths="/usr/local/lib/softhsm/libsofthsm2.so \ - /usr/lib64/pkcs11/libsofthsm2.so \ - /usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so" - -for LIB in $softhsm_paths; do - echo "Testing $LIB" - if [[ -f $LIB ]]; then - P11LIB=$LIB - echo "Setting P11LIB=$LIB" - break - fi -done -if [[ -z "$P11LIB" ]]; then - echo "Warning: Could not find the softhsm pkcs11 module" -fi - -ERRORS=0 -function assert() { - if [[ $1 != 0 ]]; then - echo "====> ERROR: $2" - ERRORS=1 - fi -} - -function generate_key() { - TYPE="$1" - ID="$2" - LABEL="$3" - - # Generate key pair - $PKCS11_TOOL --keypairgen --key-type="$TYPE" --login --pin=$PIN \ - --module="$P11LIB" --label="$LABEL" --id=$ID - - if [[ "$?" -ne "0" ]]; then - echo "Couldn't generate $TYPE key pair" - return 1 - fi - - # Extract public key from the card - $PKCS11_TOOL --read-object --id $ID --type pubkey --output-file $ID.der \ - --module="$P11LIB" - - # convert it to more digestible PEM format - if [[ ${TYPE:0:3} == "RSA" ]]; then - openssl rsa -inform DER -outform PEM -in $ID.der -pubin > $ID.pub - else - openssl ec -inform DER -outform PEM -in $ID.der -pubin > $ID.pub - fi - rm $ID.der -} - -function softhsm_initialize() { - echo "directories.tokendir = .tokens/" > .softhsm2.conf - mkdir ".tokens" - export SOFTHSM2_CONF=".softhsm2.conf" - # Init token - softhsm2-util --init-token --slot 0 --label "SC test" --so-pin="$SOPIN" --pin="$PIN" -} - -function card_setup() { - softhsm_initialize - - # Generate 1024b RSA Key pair - generate_key "RSA:1024" "01" "RSA_auth" - # Generate 2048b RSA Key pair - generate_key "RSA:2048" "02" "RSA2048" - # Generate 256b ECC Key pair - generate_key "EC:secp256r1" "03" "ECC_auth" - # Generate 521b ECC Key pair - generate_key "EC:secp521r1" "04" "ECC521" -} - -function softhsm_cleanup() { - rm .softhsm2.conf - rm -rf ".tokens" -} - -function card_cleanup() { - softhsm_cleanup - rm 0{1,2,3,4}.pub -} diff --git a/opensc.spec b/opensc.spec index a1c9b02..cf47b77 100644 --- a/opensc.spec +++ b/opensc.spec @@ -10,9 +10,6 @@ License: LGPLv2+ URL: https://github.com/OpenSC/OpenSC/wiki Source0: https://github.com/OpenSC/OpenSC/releases/download/%{version}/%{name}-%{version}.tar.gz Source1: opensc.module -# Missing from release tarball -# https://github.com/OpenSC/OpenSC/blob/master/tests/common.sh -Source2: common.sh Patch1: opensc-0.19.0-pinpad.patch # https://github.com/OpenSC/OpenSC/pull/2241/ Patch5: %{name}-gcc11.patch @@ -63,7 +60,6 @@ every software/card that does so, too. %patch8 -p1 -b .file-cache %patch9 -p1 -b .detect-empty -cp %{SOURCE2} tests/ cp -p src/pkcs15init/README ./README.pkcs15init cp -p src/scconf/README.scconf .