Remove obsolete mac-specific code from modules/libmar/verify/MacVerifyCrypto.cpp and mozglue/misc/StackWalk.cpp.

RESOLVED FIXED in Firefox 50

Status

()

RESOLVED FIXED
2 years ago
2 years ago

People

(Reporter: stefanh, Assigned: stefanh)

Tracking

Trunk
mozilla50
Unspecified
Mac OS X
Points:
---

Firefox Tracking Flags

(firefox50 fixed)

Details

Attachments

(1 attachment, 1 obsolete attachment)

(Assignee)

Description

2 years ago
Created attachment 8772579 [details] [diff] [review]
crypto-stackwalk.diff

This is the changes we talked about for a while ago.

A 15 minutes old try push is here: https://treeherder.mozilla.org/#/jobs?repo=try&revision=78ee26be1fb6
Attachment #8772579 - Flags: review?(spohl.mozilla.bugs)
Comment on attachment 8772579 [details] [diff] [review]
crypto-stackwalk.diff

Review of attachment 8772579 [details] [diff] [review]:
-----------------------------------------------------------------

Looks great. We should remove everything pertaining to CSSM while we're here. I'd like to have another look at the next patch, so clearing r? flag for now. Thanks!

::: modules/libmar/verify/MacVerifyCrypto.cpp
@@ -93,1 @@
>  static bool sCssmInitialized = false;

Please remove this and everything below that pertains to CSSM. You have removed everything that made use of this. CSSM was needed for 10.6 only.

@@ -409,5 @@
>  {
>    if (!aPublicKey || !*aPublicKey) {
>      return;
>    }
> -  if (!OnLionOrLater() && sCspHandle != CSSM_INVALID_HANDLE) {

This entire block can be removed, since this only used to be true when we weren't on Lion or later.
Attachment #8772579 - Flags: review?(spohl.mozilla.bugs)
(Assignee)

Comment 2

2 years ago
Created attachment 8773437 [details] [diff] [review]
New version

(In reply to Stephen A Pohl [:spohl] from comment #1)
 
> ::: modules/libmar/verify/MacVerifyCrypto.cpp
> @@ -93,1 @@
> >  static bool sCssmInitialized = false;
> 
> Please remove this and everything below that pertains to CSSM. You have
> removed everything that made use of this. CSSM was needed for 10.6 only.

Done.

> 
> @@ -409,5 @@
> >  {
> >    if (!aPublicKey || !*aPublicKey) {
> >      return;
> >    }
> > -  if (!OnLionOrLater() && sCspHandle != CSSM_INVALID_HANDLE) {
> 
> This entire block can be removed, since this only used to be true when we
> weren't on Lion or later.

Oops, that was embarrasing... fixed.
Attachment #8772579 - Attachment is obsolete: true
Attachment #8773437 - Flags: review?(spohl.mozilla.bugs)
Comment on attachment 8773437 [details] [diff] [review]
New version

Review of attachment 8773437 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks! Please run this through try one last time before landing.
Attachment #8773437 - Flags: review?(spohl.mozilla.bugs) → review+
(Assignee)

Comment 4

2 years ago
Thanks Stephen!

Let's see how https://treeherder.mozilla.org/#/jobs?repo=try&revision=ffb6c0a8341a looks.

Comment 5

2 years ago
Pushed by stefanh@inbox.com:
https://hg.mozilla.org/integration/mozilla-inbound/rev/0353590d4e05
Remove obsolete mac-specific code from modules/libmar/verify/MacVerifyCrypto.cpp and mozglue/misc/StackWalk.cpp. r=spohl.

Comment 6

2 years ago
bugherder
https://hg.mozilla.org/mozilla-central/rev/0353590d4e05
Status: ASSIGNED → RESOLVED
Last Resolved: 2 years ago
status-firefox50: affected → fixed
Resolution: --- → FIXED
Target Milestone: --- → mozilla50
You need to log in before you can comment on or make changes to this bug.