123917 - Remove non-NSS_3_4 codepaths

Status: VERIFIED FIXED

(Core Graveyard :: Security: UI, defect, P2)

Description

[Kai Engert [:KaiE:]]

The codebase now contains code sections, which are conditionally defined based
on whether NSS_3_4 is set or not. In the Makefiles we hardcoded NSS_3_4 to be
always enabled.

We need to remove that definitions and remove the old code.

Comment 1

[Kai Engert [:KaiE:]]

Attachment: Suggested patch

Comment 2

[Kai Engert [:KaiE:]]

Javi, I guess when can remove file PIPNSSCommon.h after checking this patch in.

Comment 3

[Kai Engert [:KaiE:]]

Attachment: Corrected patch

The previous patch had a replacement fault.

Comment 4

[Wan-Teh Chang]

Comment on attachment 69433 [details] [diff] [review]
Corrected patch

>Index: mozilla/config/config.mk
>@@ -169,9 +169,6 @@
> # 
> # NSS libs needed for final link in static build
> # 
>-NSS_3_4=1

Kai, I just checked in a patch for config/config.mk.
I believe the above is the only change you need to
make to this file now.

Please attach an updated patch and I'll review it.
Thanks.

Comment 5

[Javier Delgadillo]

I'd rather not remove PIPNSS* files from manager/ssl/macbuild.

Just remove the #define NSS_3_4 1 code in PIPNSSCommon.h and leave everything
else as is.

That way next time we have to add a define to just the PIPNSS code, we can add
it back to PIPNSSCommon.h

Comment 6

[Kai Engert [:KaiE:]]

We should delay this until bug 124211 is fixed, because it seems that will
change the current NSS_3_4 usage. Adding dependency.

Comment 7

[John Unruh]

nsbeta1

Comment 8

[Kai Engert [:KaiE:]]

*** Bug 123066 has been marked as a duplicate of this bug. ***

Comment 9

[Kai Engert [:KaiE:]]

Let's do that right after 1.1 is out.

Comment 10

[Kai Engert [:KaiE:]]

Attachment: Patch v3

Created an updated patch that applies to the current trunk.

The patch is mostly identical to what you already have looked at, besides
changed contetxt and some changes already having been applied meanwhile.

Wan-Teh, can you please review again?

Comment 11

[Wan-Teh Chang]

Comment on attachment 94171 [details] [diff] [review]
Patch v3

r=wtc.

We should file a bug that pk11pqg.h is not C++ safe.

Comment 12

[Kai Engert [:KaiE:]]

bug 161316 filed


Alec, can you please review?

Comment 13

[Alec Flett]

Comment on attachment 94171 [details] [diff] [review]
Patch v3

sr=alecf

Comment 14

[Kai Engert [:KaiE:]]

Fixed on trunk.

Comment 15

[John Unruh]

Verified per kai's comment.