Index: opensc-0.11.13/src/libopensc/card-belpic.c
===================================================================
--- opensc-0.11.13.orig/src/libopensc/card-belpic.c
+++ opensc-0.11.13/src/libopensc/card-belpic.c
@@ -1338,7 +1338,7 @@ static int belpic_pin_cmd_usage(sc_card_
 	data->pin1.encoding = data->pin2.encoding = BELPIC_PIN_ENCODING;
 	data->pin1.pad_char = data->pin2.pad_char = BELPIC_PAD_CHAR;
 	data->pin1.min_length = data->pin2.min_length = BELPIC_MIN_USER_PIN_LEN;
-	data->pin1.max_length = data->pin1.max_length = BELPIC_MAX_USER_PIN_LEN;
+	data->pin1.max_length = data->pin2.max_length = BELPIC_MAX_USER_PIN_LEN;
 	data->apdu = NULL;
 
 	return iso_ops->pin_cmd(card, data, tries_left);
Index: opensc-0.11.13/src/libopensc/card-myeid.c
===================================================================
--- opensc-0.11.13.orig/src/libopensc/card-myeid.c
+++ opensc-0.11.13/src/libopensc/card-myeid.c
@@ -394,7 +394,7 @@ static int myeid_create_file(struct sc_c
 		SC_FUNC_RETURN(card->ctx, 1, SC_ERROR_FILE_ALREADY_EXISTS);
 
 	r = sc_check_sw(card, apdu.sw1, apdu.sw2);
-	SC_TEST_RET(card->ctx, r, "Card returned error");
+	SC_FUNC_RETURN(card->ctx, 1, r);
 }
 
 /* no record oriented file services */