[pkg-opensc-commit] [engine-pkcs11] 28/43: Fixed "make distcheck"

Eric Dorland eric at moszumanska.debian.org
Sun Jan 31 06:38:49 UTC 2016 

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository engine-pkcs11.

commit 3c542cd550a0cf7f6793db23b4db6be4596d6694
Author: Michał Trojnara <Michal.Trojnara at stunnel.org>
Date:   Tue Jan 26 16:51:14 2016 +0100

    Fixed "make distcheck"
---
 .gitignore         |  8 ++++++--
 Makefile.am        |  1 +
 Makefile.mak       |  5 -----
 appveyor.yml       |  1 -
 bootstrap          |  9 ---------
 configure.ac       | 46 ++++++++++++++++++++++++++++------------------
 src/Makefile.am    |  7 +++++--
 src/versioninfo.rc | 35 +++++++++++++++++++++++++++++++++++
 tests/Makefile.am  |  3 ++-
 tests/common.sh    | 10 +++++++---
 tests/evp-sign.c   | 46 ++++++++++++++--------------------------------
 tests/softhsm      | 17 +++++++++--------
 12 files changed, 107 insertions(+), 81 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b461eb..1316382 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,6 @@ mkinstalldirs
 so_locations
 stamp-h*
 test-driver
-tests/evp-sign
 *.trs
 *.log
 .deps
@@ -45,7 +44,7 @@ tests/evp-sign
 *.pdb
 *.rej
 *.u
-*.rc
+*.res
 *.pc
 *~
 *.gz
@@ -58,3 +57,8 @@ m4/ltsugar.m4
 m4/ltversion.m4
 m4/lt~obsolete.m4
 
+test-driver
+tests/evp-sign
+tests/*.log
+tests/*.trs
+tests/output.*
diff --git a/Makefile.am b/Makefile.am
index 4714579..d86ba50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/packaged
 EXTRA_DIST = .gitignore
 
+# Prerequisites must be first on the list
 SUBDIRS = src tests
 
 dist_noinst_SCRIPTS = bootstrap
diff --git a/Makefile.mak b/Makefile.mak
index bfb1a31..312a537 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -3,11 +3,6 @@ SUBDIRS = src
 
 all::
 
-all:: config.h
-
-config.h: winconfig.h
-	@copy /y winconfig.h config.h
-	
 all depend install clean::
 	 @for %i in ( $(SUBDIRS) ) do \
 		@cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
diff --git a/appveyor.yml b/appveyor.yml
index 2a840b1..990c41c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -53,7 +53,6 @@ build_script:
   - bash -c "exec 0</dev/null && ./bootstrap"
   # disable features to speed up the script
   - bash -c "exec 0</dev/null && ./configure OPENSSL_CFLAGS=\"-IC:\OpenSSL-Win32\include -IC:\OpenSSL-Win64\include\" OPENSSL_LIBS=\"-LC:\OpenSSL-Win32 -LC:\OpenSSL-Win64 -leay\" || cat config.log"
-  - cp winconfig.h config.h
   - nmake /f Makefile.mak %NMAKE_ARCH% %NMAKE_EXTRA%
   - appveyor PushArtifact src\libp11.dll
   - appveyor PushArtifact src\libp11.lib
diff --git a/bootstrap b/bootstrap
index ffdcf30..4cd22ac 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,11 +1,2 @@
 #!/bin/sh
-
-set -e
-set -x
-if test -f Makefile; then
-  make distclean
-fi
-
-rm -rf *~ *.cache *.m4 config.guess config.log \
-	config.status config.sub depcomp ltmain.sh
 autoreconf --verbose --install --force
diff --git a/configure.ac b/configure.ac
index 182a8ff..3c10d40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ define([PACKAGE_SUFFIX], [_git])
 
 AC_INIT([engine_pkcs11],[PACKAGE_VERSION_MAJOR.PACKAGE_VERSION_MINOR.PACKAGE_VERSION_FIX[]PACKAGE_SUFFIX])
 AC_CONFIG_AUX_DIR([.])
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([src/config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
 
@@ -18,6 +18,9 @@ ENGINE_PKCS11_VERSION_FIX="PACKAGE_VERSION_FIX"
 
 AC_CONFIG_SRCDIR([src/engine_pkcs11.c])
 
+# silent build by default
+ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_CANONICAL_HOST
 AC_PROG_CC
 PKG_PROG_PKG_CONFIG
@@ -74,23 +77,29 @@ AC_ARG_WITH(
 	[enginesdir],
 	[AS_HELP_STRING([--with-enginesdir], [OpenSSL engines directory])],
 	[enginesdir="${withval}"],
-	[libcryptodir="`$PKG_CONFIG --variable=libdir --silence-errors libcrypto || \
-		$PKG_CONFIG --variable=libdir openssl`"
-	case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \
-		$PKG_CONFIG --modversion openssl`" in
-	1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x
-		debian_ssl_prefix="openssl-1.1.0";;
-	1.0.*) # Engines directory prefix for OpenSSL 1.0.x
-		debian_ssl_prefix="openssl-1.0.0";;
-	*) # Engines directory prefix for OpenSSL 0.9.x
-		debian_ssl_prefix="ssl";;
-	esac
-	if test -d "$libcryptodir/$debian_ssl_prefix/engines"; then
-		# Debian-based OpenSSL package (for example Ubuntu)
-		enginesdir="$libcryptodir/$debian_ssl_prefix/engines"
-	else # Default OpenSSL engines directory
-		enginesdir="$libcryptodir/engines"
-	fi]
+	[
+		libcryptodir="`$PKG_CONFIG --variable=libdir --silence-errors libcrypto || \
+			$PKG_CONFIG --variable=libdir openssl`"
+		case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \
+			$PKG_CONFIG --modversion openssl`" in
+		1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x
+			debian_ssl_prefix="openssl-1.1.0";;
+		1.0.*) # Engines directory prefix for OpenSSL 1.0.x
+			debian_ssl_prefix="openssl-1.0.0";;
+		*) # Engines directory prefix for OpenSSL 0.9.x
+			debian_ssl_prefix="ssl";;
+		esac
+		if test -d "$libcryptodir/$debian_ssl_prefix/engines"; then
+			# Debian-based OpenSSL package (for example Ubuntu)
+			enginesdir="$libcryptodir/$debian_ssl_prefix/engines"
+		else # Default OpenSSL engines directory
+			enginesdir="$libcryptodir/engines"
+		fi
+		if test "${prefix}" != "NONE" -o "${exec_prefix}" != "NONE"; then
+			# Override the autodetected value with the default
+			enginesdir="${libdir}"
+		fi
+	]
 )
 
 AC_ARG_WITH(
@@ -166,6 +175,7 @@ if test -n "${pkcs11_module}"; then
 		"${pkcs11_module}",
 		[Default PKCS#11 module.])
 fi
+
 AC_SUBST([enginesdir])
 AC_SUBST([ENGINE_PKCS11_VERSION_MAJOR])
 AC_SUBST([ENGINE_PKCS11_VERSION_MINOR])
diff --git a/src/Makefile.am b/src/Makefile.am
index 9556963..7b47c9d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,10 @@
-MAINTAINERCLEANFILES = \
-	$(srcdir)/Makefile.in $(srcdir)/versioninfo.rc
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
 EXTRA_DIST = Makefile.mak versioninfo.rc.in
 
+# ifeq ($(enginesdir),'')
+# enginesdir = INSTALL_DIR
+# endif
+
 engines_LTLIBRARIES = libpkcs11.la
 
 OPENSSL_EXTRA_CFLAGS = \
diff --git a/src/versioninfo.rc b/src/versioninfo.rc
new file mode 100644
index 0000000..b246fe9
--- /dev/null
+++ b/src/versioninfo.rc
@@ -0,0 +1,35 @@
+#include <winresrc.h>
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION 0,2,1,0
+	PRODUCTVERSION 0,2,1,0
+	FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+	FILEFLAGS 0x21L
+#else
+	FILEFLAGS 0x20L
+#endif
+	FILEOS 0x40004L
+	FILETYPE 0x1L
+	FILESUBTYPE 0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE "Comments", "Provided under the terms of the GNU General Public License (LGPLv2.1+).\0"
+			VALUE "CompanyName", "OpenSC Project\0"
+			VALUE "FileDescription", "OpenSSL PKCS#11 engine\0"
+			VALUE "FileVersion", "0,2,1,0\0"
+			VALUE "InternalName", "engine_pkcs11\0"
+			VALUE "LegalCopyright", "OpenSC Project\0"
+			VALUE "LegalTrademarks", "\0"
+			VALUE "OriginalFilename", "engine_pkcs11.dll\0"
+			VALUE "PrivateBuild", "\0"
+			VALUE "ProductName", "engine_pkcs11\0"
+			VALUE "ProductVersion", "0,2,1,0\0"
+			VALUE "SpecialBuild", "\0"
+		END
+	END
+END
+
diff --git a/tests/Makefile.am b/tests/Makefile.am
index df559a7..f363f7a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = cert.der key.der common.sh engines.cnf.in
+EXTRA_DIST = common.sh engines.cnf.in
 
 AM_CFLAGS = $(OPENSSL_CFLAGS)
 AM_CPPFLAGS = \
@@ -12,6 +12,7 @@ evp_sign_SOURCES = evp-sign.c
 
 check_PROGRAMS = evp-sign
 dist_check_SCRIPTS = softhsm
+dist_check_DATA = cert.der key.der pubkey.der
 
 TESTS = $(dist_check_SCRIPTS)
 
diff --git a/tests/common.sh b/tests/common.sh
index 7f70e63..592558c 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -17,6 +17,10 @@
 # along with GnuTLS; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+echo "Current directory: $(pwd)"
+echo "Source directory: ${srcdir}"
+echo "Output directory: ${outdir}"
+
 mkdir -p $outdir
 
 for i in /usr/lib64/pkcs11 /usr/lib/softhsm /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/lib /usr/lib64/softhsm;do
@@ -90,17 +94,17 @@ PUK=1234
 init_card $PIN $PUK
 
 # generate key in token
-pkcs11-tool -p $PIN --module $ADDITIONAL_PARAM -d 00010203 -a server-key -l -w ${file_dir}/key.der -y privkey >/dev/null
+pkcs11-tool -p $PIN --module $ADDITIONAL_PARAM -d 00010203 -a server-key -l -w ${srcdir}/key.der -y privkey >/dev/null
 if test $? != 0;then
 	exit 1;
 fi
 
-pkcs11-tool -p $PIN --module $ADDITIONAL_PARAM -d 00010203 -a server-key -l -w ${file_dir}/pubkey.der -y pubkey >/dev/null
+pkcs11-tool -p $PIN --module $ADDITIONAL_PARAM -d 00010203 -a server-key -l -w ${srcdir}/pubkey.der -y pubkey >/dev/null
 if test $? != 0;then
 	exit 1;
 fi
 
-pkcs11-tool -p $PIN --module $ADDITIONAL_PARAM -d 00010203 -a server-key -l -w ${file_dir}/cert.der -y cert >/dev/null
+pkcs11-tool -p $PIN --module $ADDITIONAL_PARAM -d 00010203 -a server-key -l -w ${srcdir}/cert.der -y cert >/dev/null
 if test $? != 0;then
 	exit 1;
 fi
diff --git a/tests/evp-sign.c b/tests/evp-sign.c
index 5bc5fb1..b5c0ba8 100644
--- a/tests/evp-sign.c
+++ b/tests/evp-sign.c
@@ -33,7 +33,6 @@
 #include <getopt.h>
 #include <err.h>
 #include <arpa/inet.h>
-#include <openssl/bio.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>
@@ -46,6 +45,7 @@ static UI_METHOD *ui_detect_failed_ctrl = NULL;
 
 static int ui_open_fail(UI *ui)
 {
+	(void) ui;
 	fprintf(stderr, "It seems like get_pin fell through even though the pin should already be set!\n");
 	return 0;
 }
@@ -138,27 +138,22 @@ static void display_openssl_errors(int l)
 
 int main(int argc, char **argv)
 {
-	char *hash_algo = NULL;
-	char *private_key_name, *x509_name, *module_name, *dest_name;
+	char *private_key_name, *public_key_name;
 	unsigned char buf[4096];
 	const EVP_MD *digest_algo;
-	EVP_PKEY *private_key, *pubkey;
+	EVP_PKEY *private_key, *public_key;
 	char *key_pass = NULL;
-	X509 *x509;
 	unsigned n;
 	int ret;
-	long errline;
 	ENGINE *e;
-	CONF *conf;
 	EVP_MD_CTX *ctx;
 	const char *module_path, *efile;
-	BIO *in, *b;
 	enum { NONE, BY_DEFAULT, BY_CTRL } pin_method = NONE;
 	UI_METHOD *ui_method = NULL;
 	void *ui_extra = NULL;
 
 	if (argc < 5) {
-		fprintf(stderr, "usage: %s [PIN setting method] [PIN] [CONF] [private key URL] [module]\n", argv[0]);
+		fprintf(stderr, "usage: %s [PIN setting method] [PIN] [CONF] [private key URL] [public key URL] [module]\n", argv[0]);
 		fprintf(stderr, "\n");
 		fprintf(stderr, "PIN setting method can be 'default' or 'ctrl'\n");
 		exit(1);
@@ -173,9 +168,10 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 	key_pass = argv[2];
-	private_key_name = argv[4];
-	module_path = argv[5];
 	efile = argv[3];
+	private_key_name = argv[4];
+	public_key_name = argv[5];
+	module_path = argv[6];
 
 	setup_ui();
 
@@ -232,27 +228,13 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	x509_name = "cert.der";
-
-	b = BIO_new_file(x509_name, "rb");
-	if (b == NULL) {
-		fprintf(stderr, "error loading %s\n", x509_name);
-		exit(1);
-	}
-
-	x509 = d2i_X509_bio(b, NULL);	/* Binary encoded X.509 */
-	if (x509 == NULL) {
-		BIO_reset(b);
-		x509 = PEM_read_bio_X509(b, NULL, NULL, NULL);	/* PEM encoded X.509 */
-	}
-
-	if (x509 == NULL) {
-		fprintf(stderr, "error loading cert %s\n", x509_name);
+	public_key = ENGINE_load_public_key(e, public_key_name,
+		ui_method, ui_extra);
+	if (public_key == NULL) {
+		fprintf(stderr, "cannot load: %s\n", public_key_name);
+		display_openssl_errors(__LINE__);
 		exit(1);
 	}
-	pubkey = X509_get_pubkey(x509);
-
-	BIO_free(b);
 
 	/* Digest the module data. */
 	OpenSSL_add_all_digests();
@@ -287,7 +269,7 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	if (EVP_DigestVerifyInit(ctx, NULL, digest_algo, NULL, pubkey) <= 0) {
+	if (EVP_DigestVerifyInit(ctx, NULL, digest_algo, NULL, public_key) <= 0) {
 		display_openssl_errors(__LINE__);
 		exit(1);
 	}
@@ -303,7 +285,7 @@ int main(int argc, char **argv)
 	}
 	EVP_MD_CTX_destroy(ctx);
 
-	EVP_PKEY_free(pubkey);
+	EVP_PKEY_free(public_key);
 	EVP_PKEY_free(private_key);
 	ENGINE_finish(e);
 	CONF_modules_unload(1);
diff --git a/tests/softhsm b/tests/softhsm
index ba6c260..7e078cb 100755
--- a/tests/softhsm
+++ b/tests/softhsm
@@ -16,8 +16,7 @@
 # along with GnuTLS; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-outdir="${srcdir}/output.$$"
-file_dir="${srcdir:-./}"
+outdir="output.$$"
 
 . ${srcdir}/common.sh
 
@@ -26,38 +25,40 @@ file_dir="${srcdir:-./}"
 sed -e "s|@MODULE_PATH@|${ADDITIONAL_PARAM}|g" -e "s|@ENGINE_PATH@|../src/.libs/libpkcs11.so|g" <"${srcdir}/engines.cnf.in" >engines.cnf
 
 export OPENSSL_ENGINES="../src/.libs/"
+PRIVATE_KEY="pkcs11:token=libp11-test;id=%00%01%02%03;object=server-key;type=private;pin-value=1234"
+PUBLIC_KEY="pkcs11:token=libp11-test;id=%00%01%02%03;object=server-key;type=public;pin-value=1234"
 
-./evp-sign ctrl false engines.cnf "pkcs11:token=libp11-test;id=%00%01%02%03;object=server-key;type=private;pin-value=1234" ${ADDITIONAL_PARAM}
+./evp-sign ctrl false engines.cnf ${PRIVATE_KEY} ${PUBLIC_KEY} ${ADDITIONAL_PARAM}
 if test $? != 0;then
 	echo "Basic PKCS #11 test, using ctrl failed"
 	exit 1;
 fi
 
-./evp-sign default false engines.cnf "pkcs11:token=libp11-test;id=%00%01%02%03;object=server-key;type=private;pin-value=1234" ${ADDITIONAL_PARAM}
+./evp-sign default false engines.cnf ${PRIVATE_KEY} ${PUBLIC_KEY} ${ADDITIONAL_PARAM}
 if test $? != 0;then
 	echo "Basic PKCS #11 test, using default failed"
 	exit 1;
 fi
 
-./evp-sign ctrl 1234 engines.cnf "pkcs11:token=libp11-test;id=%00%01%02%03;object=server-key;type=private" ${ADDITIONAL_PARAM}
+./evp-sign ctrl 1234 engines.cnf ${PRIVATE_KEY} ${PUBLIC_KEY} ${ADDITIONAL_PARAM}
 if test $? != 0;then
 	echo "Basic PKCS #11 test without pin-value, using ctrl failed"
 	exit 1;
 fi
 
-./evp-sign default 1234 engines.cnf "pkcs11:token=libp11-test;id=%00%01%02%03;object=server-key;type=private" ${ADDITIONAL_PARAM}
+./evp-sign default 1234 engines.cnf ${PRIVATE_KEY} ${PUBLIC_KEY} ${ADDITIONAL_PARAM}
 if test $? != 0;then
 	echo "Basic PKCS #11 test without pin-value, using default failed"
 	exit 1;
 fi
 
-./evp-sign ctrl 1234 engines.cnf "label_server-key" ${ADDITIONAL_PARAM}
+./evp-sign ctrl 1234 engines.cnf "label_server-key" "label_server-key" ${ADDITIONAL_PARAM}
 if test $? != 0;then
 	echo "Basic PKCS #11 test with legacy name #1 failed"
 	exit 1;
 fi
 
-./evp-sign default 1234 engines.cnf "id_00010203" ${ADDITIONAL_PARAM}
+./evp-sign default 1234 engines.cnf "id_00010203" "id_00010203" ${ADDITIONAL_PARAM}
 if test $? != 0;then
 	echo "Basic PKCS #11 test with legacy name #2 failed"
 	exit 1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/engine-pkcs11.git

More information about the pkg-opensc-commit mailing list