cardos,incrypto34: restored semantics of select_pin_reference

frankmorgner · Mar 3, 2014 · 73971f2 · 73971f2
1 parent b4a086a
commit 73971f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c
@@ -165,6 +165,8 @@ cardos_select_pin_reference(sc_profile_t *profile, sc_pkcs15_card_t *p15card,
 
 	if (auth_info->attrs.pin.flags & SC_PKCS15_PIN_FLAG_SO_PIN) {
 		preferred = 1;
+		if (current > preferred)
+			return SC_ERROR_TOO_MANY_OBJECTS;
 	} else {
 		preferred = current;
 		/* PINs are even numbered, PUKs are odd */

diff --git a/src/pkcs15init/pkcs15-incrypto34.c b/src/pkcs15init/pkcs15-incrypto34.c
@@ -184,6 +184,8 @@ incrypto34_select_pin_reference(sc_profile_t *profile, sc_pkcs15_card_t *p15card
 
 	if (auth_info->attrs.pin.flags & SC_PKCS15_PIN_FLAG_SO_PIN) {
 		preferred = 1;
+		if (current > preferred)
+			return SC_ERROR_TOO_MANY_OBJECTS;
 	} else {
 		preferred = current;
 		/* PINs are even numbered, PUKs are odd */