265652 - Possible code cleanup of nsNSSCertificateDB and nsPKCS12Blob

Status: RESOLVED FIXED

(Core Graveyard :: Security: UI, defect)

Description

[timeless]

nsPKCS12Blob::ImportFromFileHelper's handling of strings is fairly disturbing,
as is nsPKCS12Blob::nickname_collision.

I've also made one change to nsNSSCertificateDB::ImportPKCS12File

Comment 1

[timeless]

Attachment: changes

Comment 2

[Darin Fisher]

Comment on attachment 163040 [details] [diff] [review]
changes

>Index: security/manager/ssl/src/nsPKCS12Blob.cpp

>+  {
>+    NS_ConvertUTF16toUTF8 tokenNameCString(tokenName);
>+    slot = PK11_FindSlotByName(tokenNameCString.BeginWriting());
>+  }

BeginWriting should only be called if you intend to actually write
to the string's buffer.  I think in this case, that NS_CONST_CAST
is better:

  slot = PK11_FindSlotByName(
      NS_CONST_CAST(char *, tokenNameCString.BeginReading()));


sr=darin with that change.  i don't know if kaie is reviewing code
still... you might want to find another reviewer.

Comment 3

[timeless]

i won't need that cast and could use BeginReading as soon as the fix for bug
265686 is available.

Comment 4

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 163040 [details] [diff] [review]
changes

more context would've been nice...

security/manager/ssl/src/nsPKCS12Blob.cpp
+    slot = PK11_FindSlotByName(tokenNameCString.BeginWriting());

make that .get()

Comment 5

[timeless]

mozilla/security/manager/ssl/src/nsPKCS12Blob.cpp 	1.42
mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp 	1.15