Attachment 67704 Details for Bug 148902

eID-belgium-2.52-fixes.patch

eID-belgium-2.52-fixes.patch (text/plain), 4.08 KB, created by jo de baer on 2006-02-10 20:16:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jo de baer

Created: 2006-02-10 20:16:51 UTC

Size: 4.08 KB

patch

obsolete

>diff -Naur beid-2.52.orig/SConstruct beid-2.52/SConstruct
>--- beid-2.52.orig/SConstruct	2006-01-24 18:16:35.000000000 +0100
>+++ beid-2.52/SConstruct	2006-01-26 16:06:41.000000000 +0100
>@@ -22,7 +22,7 @@
> env['QT_LIB'] = 'qt-mt'
> env.Append(ENV = {'HOME': os.environ['HOME']})
> env.AppendUnique(CCFLAGS='-Dlinux -pipe')
>-env.Append(CCFLAGS='-DQT_THREAD_SUPPORT -D_REENTRANT')
>+env.Append(CCFLAGS=' -DQT_THREAD_SUPPORT -D_REENTRANT')
> env.AppendUnique(CPPPATH=['/usr/include/PCSC']) # here needed for config step (for debian)
> 
> if os.path.isfile("/etc/mandriva-release"):
>diff -Naur beid-2.52.orig/src/newpkcs11/src/libopensc/card-belpic.c beid-2.52/src/newpkcs11/src/libopensc/card-belpic.c
>--- beid-2.52.orig/src/newpkcs11/src/libopensc/card-belpic.c	2006-01-24 18:16:35.000000000 +0100
>+++ beid-2.52/src/newpkcs11/src/libopensc/card-belpic.c	2006-01-26 17:23:53.000000000 +0100
>@@ -1261,11 +1261,13 @@
> 	BYTE card_status[2];
> 	void *hDlg;
> 	int first_time = 1, r = SC_ERROR_PIN_CODE_INCORRECT;
>+#ifdef HAVE_GUI
> 	int lang = belpic_calculate_lang(card);
> 	SCR_PinUsage scr_pin_usage = {
> 		pin_usage,
> 		pin_usage == SCR_USAGE_SIGN ? "SIG" : "AUT",
> 		pin_usage == SCR_USAGE_SIGN ? pin_usg_sig[lang] : pin_usg_auth[lang]
>+#endif
> 	};
> 	char *reader_name = card->reader->name;
> 	char *pp_msg_login_sh =
>@@ -1327,6 +1329,7 @@
> 	BYTE card_status[2];
> 	void *hDlg;
> 	int first_time = 1, r = SC_ERROR_KEYPAD_PIN_MISMATCH, r1;
>+#ifdef HAVE_GUI
> 	int lang = belpic_calculate_lang(card);
> 	char *reader_name = card->reader->name;
> 
>@@ -1373,7 +1376,7 @@
> 			r, card_status[0], card_status[1]);
> 		r = belpic_pp_test_res(card, r, card_status, tries_left);
> 	}
>-
>+#endif
> 	return r;
> }
> 
>@@ -1387,13 +1390,13 @@
> 	u8 new_pin_data[BELPIC_MAX_USER_PIN_LEN+1];
> 	int new_pin_len = sizeof(new_pin_data);
> 	int r;
>+#ifdef BELPIC_PIN_PAD
> 	int lang = belpic_calculate_lang(card);
> 	char *enter_pin_msg = (pin_usage == SCR_USAGE_AUTH ?
> 			enter_pin_msg_auth[lang] : enter_pin_msg_sign[lang]);
> 	scgui_param_t icon = (pin_usage == SCR_USAGE_AUTH ?
> 			SCGUI_NO_ICON : SCGUI_SIGN_ICON);
> 
>-#ifdef BELPIC_PIN_PAD
> 	struct belpic_priv_data *priv = DRVDATA(card);
> 	sc_apdu_t apdu;
> 	if (card->slot->capabilities & SC_SLOT_CAP_PIN_PAD && priv->scr_init != NULL) {
>@@ -1435,6 +1438,7 @@
> 
>     if(data->cmd == SC_PIN_CMD_CHANGE && (data->pin1.len == 0 || data->pin2.len == 0))
>     {
>+#ifdef HAVE_GUI
> 	    r = pGuiChangePin(app_msg[lang], pp_msg_change_sh[lang], old_pin_data, &old_pin_len, new_pin_data, &new_pin_len,
> 		    btn_msg_ok[lang], btn_msg_cancel[lang], wrong_pin_len_msgs[lang],
> 		    msg_pin_mismatch[lang]);
>@@ -1442,7 +1446,7 @@
> 		    return SC_ERROR_KEYPAD_CANCELLED;
> 	    if (r != SCGUI_OK)
> 		    return SC_ERROR_INTERNAL;
>-
>+#endif
>         data->pin1.data = old_pin_data;
> 	    data->pin1.len = old_pin_len;
> 	    data->pin2.data = new_pin_data;
>@@ -1450,6 +1454,7 @@
>     }
>     else if(data->cmd == SC_PIN_CMD_VERIFY && data->pin1.len == 0)
>     {
>+#ifdef HAVE_GUI
> 	    r = pGuiEnterPin(app_msg[lang], enter_pin_msg, old_pin_data, &old_pin_len,
> 		    btn_msg_ok[lang], btn_msg_cancel[lang], wrong_pin_len_msgs[lang],
> 		    icon);
>@@ -1457,7 +1462,7 @@
> 		    return SC_ERROR_KEYPAD_CANCELLED;
> 	    if (r != SCGUI_OK)
> 		    return SC_ERROR_INTERNAL;
>-
>+#endif
>         data->pin1.data = old_pin_data;
> 	    data->pin1.len = old_pin_len;
> 		r = belpic_pin_cmd_usage(card, data, tries_left, pin_usage);
>diff -Naur beid-2.52.orig/src/newpkcs11/src/libopensc/ctx.c beid-2.52/src/newpkcs11/src/libopensc/ctx.c
>--- beid-2.52.orig/src/newpkcs11/src/libopensc/ctx.c	2006-01-24 18:16:35.000000000 +0100
>+++ beid-2.52/src/newpkcs11/src/libopensc/ctx.c	2006-01-26 16:51:31.000000000 +0100
>@@ -30,6 +30,8 @@
> /* Default Belpic settings */
> #define OPENSC_CONFIG_STRING "app default {\n framework pkcs15 {\n use_caching = true;\n }\n }\n app opensc-pkcs11 {\n pkcs11 {\n num_slots = 2;\n hide_empty_tokens = true;\n lock_login = false;\n }\n }\n"
> 
>+#define OPENSC_CONF_PATH "/etc/beidbase.conf"
>+
> /* Belpic: the older belpic cards have a bug: fast readers send
>  * a Get Response APDU too fast, so the card can't handle it.
>  * Our solution is a configurable delay (in msecs) before

Actions: View

Attachments on bug 148902: 67704