Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 317630, PSM's FIPS token label is truncated

Browse Source 
r=rrelyea
This commit is contained in:
kaie%kuix.de 2007-02-20 16:26:07 +00:00
parent 9288733eee
commit 88b4027c75
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
security/manager/locales/en-US/chrome/pipnss/pipnss.properties
View File

@ -68,10 +68,10 @@ SlotDescription=PSM Internal Cryptographic Services
# 64 bytes long after conversion to UTF8
PrivateSlotDescription=PSM Private Keys
#
# 32
Fips140TokenDescription=FIPS-140 Softw. Security Device
# 64
FipsSlotDescription=PSM Internal FIPS-140-1 Cryptographic Services
# 64
FipsPrivateSlotDescription=PSM FIPS-140-1 User Private Key Services
Fips140SlotDescription=FIPS-140 Cryptographic, Key and Certificate Services
# 32
InternalToken=Software Security Device
# End of size restriction.

2
security/manager/pki/resources/content/device_manager.xul
View File

@ -61,7 +61,7 @@
<grid flex="1" style="margin:5px">
<columns>
<column flex="1"/>
<column flex="1"/>
<column flex="3"/>
<column/>
</columns>
<rows>

12
security/manager/ssl/src/nsNSSComponent.cpp
View File

@ -802,8 +802,8 @@ nsNSSComponent::ConfigureInternalPKCS11Token()
nsAutoString privateTokenDescription;
nsAutoString slotDescription;
nsAutoString privateSlotDescription;
nsAutoString fipsSlotDescription;
nsAutoString fipsPrivateSlotDescription;
nsAutoString fips140TokenDescription;
nsAutoString fips140SlotDescription;
nsresult rv;
rv = GetPIPNSSBundleString("ManufacturerID", manufacturerID);
@ -824,10 +824,10 @@ nsNSSComponent::ConfigureInternalPKCS11Token()
rv = GetPIPNSSBundleString("PrivateSlotDescription", privateSlotDescription);
if (NS_FAILED(rv)) return rv;
rv = GetPIPNSSBundleString("FipsSlotDescription", fipsSlotDescription);
rv = GetPIPNSSBundleString("Fips140TokenDescription", fips140TokenDescription);
if (NS_FAILED(rv)) return rv;
rv = GetPIPNSSBundleString("FipsPrivateSlotDescription", fipsPrivateSlotDescription);
rv = GetPIPNSSBundleString("Fips140SlotDescription", fips140SlotDescription);
if (NS_FAILED(rv)) return rv;
PK11_ConfigurePKCS11(NS_ConvertUTF16toUTF8(manufacturerID).get(),
@ -836,8 +836,8 @@ nsNSSComponent::ConfigureInternalPKCS11Token()
NS_ConvertUTF16toUTF8(privateTokenDescription).get(),
NS_ConvertUTF16toUTF8(slotDescription).get(),
NS_ConvertUTF16toUTF8(privateSlotDescription).get(),
NS_ConvertUTF16toUTF8(fipsSlotDescription).get(),
NS_ConvertUTF16toUTF8(fipsPrivateSlotDescription).get(),
NS_ConvertUTF16toUTF8(fips140TokenDescription).get(),
NS_ConvertUTF16toUTF8(fips140SlotDescription).get(),
0, 0);
return NS_OK;
}