Blame SOURCES/nss-softokn-3.16-fips_user_slots.patch
|
 |
6fbbf4 |
diff -up ./nss/lib/softoken/fipstokn.c.fips_user_slots ./nss/lib/softoken/fipstokn.c
|
|
|
6fbbf4 |
--- ./nss/lib/softoken/fipstokn.c.fips_user_slots 2014-11-04 15:34:07.524248232 -0800
|
|
|
6fbbf4 |
+++ ./nss/lib/softoken/fipstokn.c 2014-11-04 15:37:22.774525906 -0800
|
|
|
6fbbf4 |
@@ -546,8 +546,10 @@ CK_RV FC_GetSlotInfo(CK_SLOT_ID slotID,
|
|
|
6fbbf4 |
CHECK_FORK();
|
|
|
6fbbf4 |
|
|
|
6fbbf4 |
SFTK_FIPSFATALCHECK();
|
|
|
6fbbf4 |
- if (slotID == FIPS_SLOT_ID) slotID = NETSCAPE_SLOT_ID;
|
|
|
6fbbf4 |
- /* FIPS Slot supports all functions */
|
|
|
6fbbf4 |
+ if ((slotID == FIPS_SLOT_ID) || (slotID >=SFTK_MIN_FIPS_USER_SLOT_ID)) {
|
|
|
6fbbf4 |
+ slotID = NETSCAPE_SLOT_ID;
|
|
|
6fbbf4 |
+ }
|
|
|
6fbbf4 |
+ /* FIPS Slots support all functions */
|
|
|
6fbbf4 |
return NSC_GetMechanismList(slotID,pMechanismList,pusCount);
|
|
|
6fbbf4 |
}
|
|
|
6fbbf4 |
|
|
|
6fbbf4 |
@@ -559,8 +561,10 @@ CK_RV FC_GetSlotInfo(CK_SLOT_ID slotID,
|
|
|
6fbbf4 |
CHECK_FORK();
|
|
|
6fbbf4 |
|
|
|
6fbbf4 |
SFTK_FIPSFATALCHECK();
|
|
|
6fbbf4 |
- if (slotID == FIPS_SLOT_ID) slotID = NETSCAPE_SLOT_ID;
|
|
|
6fbbf4 |
- /* FIPS Slot supports all functions */
|
|
|
6fbbf4 |
+ if ((slotID == FIPS_SLOT_ID) || (slotID >=SFTK_MIN_FIPS_USER_SLOT_ID)) {
|
|
|
6fbbf4 |
+ slotID = NETSCAPE_SLOT_ID;
|
|
|
6fbbf4 |
+ }
|
|
|
6fbbf4 |
+ /* FIPS Slots support all functions */
|
|
|
6fbbf4 |
return NSC_GetMechanismInfo(slotID,type,pInfo);
|
|
|
6fbbf4 |
}
|
|
|
6fbbf4 |
|