- fix tests build, rel 6

[packages/opensc.git] / build.patch

--- /dev/null	2018-05-15 12:27:28.000000000 +0200
+++ opensc-0.19.0/src/tests/p11test/p11test_common.h	2018-09-25 21:02:30.158771398 +0200
@@ -0,0 +1,89 @@
+/*
+ * p11test_common.h: Test suite shared declarations for PKCS#11 API
+ *
+ * Copyright (C) 2016 Martin Strhársky <strharsky.martin@gmail.com>
+ * Copyright (C) 2016, 2017 Red Hat, Inc.
+ *
+ * Author: Jakub Jelen <jjelen@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef P11TEST_COMMON_H
+#define P11TEST_COMMON_H
+#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <setjmp.h>
+#include <cmocka.h>
+#include "pkcs11/pkcs11.h"
+#include "libopensc/sc-ossl-compat.h"
+
+#define MAX_MECHS 200
+
+#ifndef NDEBUG
+	#define debug_print(fmt, ...) \
+		{ fprintf(stderr, fmt "\n", ##__VA_ARGS__); } while (0)
+#else
+	#define debug_print(fmt, ...)
+#endif
+
+#define FLAGS_SIGN		0x01
+#define FLAGS_SIGN_OPENSSL	0x02
+#define FLAGS_SIGN_ANY		( FLAGS_SIGN | FLAGS_SIGN_OPENSSL )
+#define FLAGS_DECRYPT		0x04
+#define FLAGS_DECRYPT_OPENSSL	0x08
+#define FLAGS_DECRYPT_ANY	( FLAGS_DECRYPT | FLAGS_DECRYPT_OPENSSL )
+
+typedef struct {
+	char *outfile;
+	FILE *fd;
+	int in_test;
+	int first;
+	int in_data;
+	int first_data;
+} log_context_t;
+
+typedef struct {
+	CK_MECHANISM_TYPE mech;
+	CK_MECHANISM_TYPE hash;
+	CK_RSA_PKCS_MGF_TYPE mgf;
+	int salt;
+	int usage_flags;
+	int result_flags;
+} test_mech_t;
+
+typedef struct {
+	CK_FUNCTION_LIST_PTR function_pointer;
+	CK_SLOT_ID slot_id;
+	CK_SESSION_HANDLE session_handle;
+	CK_UTF8CHAR* pin;
+	size_t pin_length;
+	char *library_path;
+	unsigned int interactive;
+	log_context_t log;
+
+	test_mech_t rsa_mechs[MAX_MECHS];
+	size_t  num_rsa_mechs;
+	test_mech_t	ec_mechs[MAX_MECHS];
+	size_t  num_ec_mechs;
+	test_mech_t	keygen_mechs[MAX_MECHS];
+	size_t  num_keygen_mechs;
+} token_info_t;
+
+extern token_info_t token;
+
+#endif /* P11TEST_COMMON_H */
+
From c012f46965b3fe24e31367796e52c2d0b14ca5d9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 17 Dec 2018 18:44:23 -0800
Subject: [PATCH] Remove redundant logging

Same information is printed a few line below in same function, the only
difference is that there it takes care of case when label is NULL pointer
unlike this line

secondly, every function call to cosm_write_tokeninfo() in this file
passes label=NULL, and then it tries to print a null pointer

Fixes errors like
src/libopensc/log.h:48:47: error: '%s' directive argument is null
[-Werror=format-overflow=]

Upstream-Status: Submitted [https://github.com/OpenSC/OpenSC/pull/1557]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 src/pkcs15init/pkcs15-oberthur.c | 1 -
 1 file changed, 1 deletion(-)

Index: git/src/pkcs15init/pkcs15-oberthur.c
===================================================================
--- git.orig/src/pkcs15init/pkcs15-oberthur.c
+++ git/src/pkcs15init/pkcs15-oberthur.c
@@ -70,7 +70,6 @@ cosm_write_tokeninfo (struct sc_pkcs15_c
 	ctx = p15card->card->ctx;
 
 	SC_FUNC_CALLED(ctx, SC_LOG_DEBUG_VERBOSE);
-	sc_debug(ctx, SC_LOG_DEBUG_NORMAL, "cosm_write_tokeninfo() label '%s'; flags 0x%X", label, flags);
 	if (sc_profile_get_file(profile, COSM_TITLE"-token-info", &file)) {
 		rv = SC_ERROR_INCONSISTENT_PROFILE;
 		SC_TEST_GOTO_ERR(ctx, SC_LOG_DEBUG_NORMAL, rv, "Cannot find "COSM_TITLE"-token-info");
--- opensc-0.19.0/src/tests/p11test/p11test.c~	2018-09-13 13:52:42.000000000 +0200
+++ opensc-0.19.0/src/tests/p11test/p11test.c	2021-10-15 22:37:12.303953281 +0200
@@ -33,6 +33,8 @@
 
 #define DEFAULT_P11LIB	"../../pkcs11/.libs/opensc-pkcs11.so"
 
+token_info_t token;
+
 void display_usage() {
 	fprintf(stdout,
 		" Usage:\n"