add separate "expired cert" alert (bug 150731)

camino/English.lproj/alert.nib/classes.nib

@@ -23,6 +23,7 @@
                 confirmPanelButton2 = id; 
                 confirmPanelButton3 = id; 
                 confirmPanelText = id; 
+                expiredCertPanel = id; 
                 owner = id; 
                 passwordPanel = id; 
                 passwordPanelCheck = id; 

camino/English.lproj/alert.nib/info.nib

@@ -3,10 +3,10 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>44 234 356 301 0 0 1024 746 </string>
+	<string>285 97 356 301 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5Q125</string>
 </dict>
 </plist>

camino/alert.nib/classes.nib

@@ -23,6 +23,7 @@
                 confirmPanelButton2 = id; 
                 confirmPanelButton3 = id; 
                 confirmPanelText = id; 
+                expiredCertPanel = id; 
                 owner = id; 
                 passwordPanel = id; 
                 passwordPanelCheck = id; 

camino/alert.nib/info.nib

@@ -3,10 +3,10 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>44 234 356 301 0 0 1024 746 </string>
+	<string>285 97 356 301 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5Q125</string>
 </dict>
 </plist>

camino/nsAlertController.h

@@ -64,6 +64,7 @@
     IBOutlet id passwordPanelText;
     IBOutlet id passwordPanelInput;
     IBOutlet id securityMismatchPanel;
+    IBOutlet id expiredCertPanel;
     IBOutlet id securityUnknownPanel;
     IBOutlet id usernamePanel;
     IBOutlet id usernamePanelCheck;
@@ -94,6 +95,7 @@
 - (BOOL)promptPassword:(NSWindow*)parent title:(NSString*)title text:(NSString*)text passwordText:(NSMutableString*)passwordText checkMsg:(NSString*)checkMsg checkValue:(BOOL*)checkValue doCheck:(BOOL)doCheck;
 
 - (BOOL)badCert:(NSWindow*)parent;
+- (BOOL)expiredCert:(NSWindow*)parent;
 - (int)unknownCert:(NSWindow*)parent;
 
 @end

camino/nsAlertController.mm

@@ -276,6 +276,15 @@
   return (result == 1);
 }
 
+- (BOOL)expiredCert:(NSWindow*)parent
+{
+  int result = [NSApp runModalForWindow:expiredCertPanel relativeToWindow:parent];
+  [expiredCertPanel close];
+
+  return (result == 1);
+}
+
+
 - (int)unknownCert:(NSWindow*)parent
 {
   int result = [NSApp runModalForWindow:securityUnknownPanel relativeToWindow:parent];

camino/nsCocoaBrowserService.mm

@@ -650,7 +650,7 @@ nsCocoaBrowserService::CertExpired(nsITransportSecurityInfo *socketInfo,
   // HACK: there is no way to get which window this is for from the API. The
   // security team in mozilla just cheats and assumes the frontmost window so
   // that's what we'll do. Yes, it's wrong. Yes, it's skanky. Oh well.
-  *_retval = (PRBool)[controller badCert:[NSApp mainWindow]];
+  *_retval = (PRBool)[controller certExpired:[NSApp mainWindow]];
   
   return NS_OK;
 }

camino/resources/localized/English.lproj/alert.nib/classes.nib

@@ -23,6 +23,7 @@
                 confirmPanelButton2 = id; 
                 confirmPanelButton3 = id; 
                 confirmPanelText = id; 
+                expiredCertPanel = id; 
                 owner = id; 
                 passwordPanel = id; 
                 passwordPanelCheck = id; 

camino/resources/localized/English.lproj/alert.nib/info.nib

@@ -3,10 +3,10 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>44 234 356 301 0 0 1024 746 </string>
+	<string>285 97 356 301 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5Q125</string>
 </dict>
 </plist>

camino/src/browser/nsAlertController.h

@@ -64,6 +64,7 @@
     IBOutlet id passwordPanelText;
     IBOutlet id passwordPanelInput;
     IBOutlet id securityMismatchPanel;
+    IBOutlet id expiredCertPanel;
     IBOutlet id securityUnknownPanel;
     IBOutlet id usernamePanel;
     IBOutlet id usernamePanelCheck;
@@ -94,6 +95,7 @@
 - (BOOL)promptPassword:(NSWindow*)parent title:(NSString*)title text:(NSString*)text passwordText:(NSMutableString*)passwordText checkMsg:(NSString*)checkMsg checkValue:(BOOL*)checkValue doCheck:(BOOL)doCheck;
 
 - (BOOL)badCert:(NSWindow*)parent;
+- (BOOL)expiredCert:(NSWindow*)parent;
 - (int)unknownCert:(NSWindow*)parent;
 
 @end

camino/src/browser/nsAlertController.mm

@@ -276,6 +276,15 @@
   return (result == 1);
 }
 
+- (BOOL)expiredCert:(NSWindow*)parent
+{
+  int result = [NSApp runModalForWindow:expiredCertPanel relativeToWindow:parent];
+  [expiredCertPanel close];
+
+  return (result == 1);
+}
+
+
 - (int)unknownCert:(NSWindow*)parent
 {
   int result = [NSApp runModalForWindow:securityUnknownPanel relativeToWindow:parent];

camino/src/embedding/CHBrowserService.mm

@@ -650,7 +650,7 @@ nsCocoaBrowserService::CertExpired(nsITransportSecurityInfo *socketInfo,
   // HACK: there is no way to get which window this is for from the API. The
   // security team in mozilla just cheats and assumes the frontmost window so
   // that's what we'll do. Yes, it's wrong. Yes, it's skanky. Oh well.
-  *_retval = (PRBool)[controller badCert:[NSApp mainWindow]];
+  *_retval = (PRBool)[controller certExpired:[NSApp mainWindow]];
   
   return NS_OK;
 }

chimera/English.lproj/alert.nib/classes.nib

@@ -23,6 +23,7 @@
                 confirmPanelButton2 = id; 
                 confirmPanelButton3 = id; 
                 confirmPanelText = id; 
+                expiredCertPanel = id; 
                 owner = id; 
                 passwordPanel = id; 
                 passwordPanelCheck = id; 

chimera/English.lproj/alert.nib/info.nib

@@ -3,10 +3,10 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>44 234 356 301 0 0 1024 746 </string>
+	<string>285 97 356 301 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5Q125</string>
 </dict>
 </plist>

chimera/alert.nib/classes.nib

@@ -23,6 +23,7 @@
                 confirmPanelButton2 = id; 
                 confirmPanelButton3 = id; 
                 confirmPanelText = id; 
+                expiredCertPanel = id; 
                 owner = id; 
                 passwordPanel = id; 
                 passwordPanelCheck = id; 

chimera/alert.nib/info.nib

@@ -3,10 +3,10 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>44 234 356 301 0 0 1024 746 </string>
+	<string>285 97 356 301 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5Q125</string>
 </dict>
 </plist>

chimera/nsAlertController.h

@@ -64,6 +64,7 @@
     IBOutlet id passwordPanelText;
     IBOutlet id passwordPanelInput;
     IBOutlet id securityMismatchPanel;
+    IBOutlet id expiredCertPanel;
     IBOutlet id securityUnknownPanel;
     IBOutlet id usernamePanel;
     IBOutlet id usernamePanelCheck;
@@ -94,6 +95,7 @@
 - (BOOL)promptPassword:(NSWindow*)parent title:(NSString*)title text:(NSString*)text passwordText:(NSMutableString*)passwordText checkMsg:(NSString*)checkMsg checkValue:(BOOL*)checkValue doCheck:(BOOL)doCheck;
 
 - (BOOL)badCert:(NSWindow*)parent;
+- (BOOL)expiredCert:(NSWindow*)parent;
 - (int)unknownCert:(NSWindow*)parent;
 
 @end

chimera/nsAlertController.mm

@@ -276,6 +276,15 @@
   return (result == 1);
 }
 
+- (BOOL)expiredCert:(NSWindow*)parent
+{
+  int result = [NSApp runModalForWindow:expiredCertPanel relativeToWindow:parent];
+  [expiredCertPanel close];
+
+  return (result == 1);
+}
+
+
 - (int)unknownCert:(NSWindow*)parent
 {
   int result = [NSApp runModalForWindow:securityUnknownPanel relativeToWindow:parent];

chimera/nsCocoaBrowserService.mm

@@ -650,7 +650,7 @@ nsCocoaBrowserService::CertExpired(nsITransportSecurityInfo *socketInfo,
   // HACK: there is no way to get which window this is for from the API. The
   // security team in mozilla just cheats and assumes the frontmost window so
   // that's what we'll do. Yes, it's wrong. Yes, it's skanky. Oh well.
-  *_retval = (PRBool)[controller badCert:[NSApp mainWindow]];
+  *_retval = (PRBool)[controller certExpired:[NSApp mainWindow]];
   
   return NS_OK;
 }

chimera/resources/localized/English.lproj/alert.nib/classes.nib

@@ -23,6 +23,7 @@
                 confirmPanelButton2 = id; 
                 confirmPanelButton3 = id; 
                 confirmPanelText = id; 
+                expiredCertPanel = id; 
                 owner = id; 
                 passwordPanel = id; 
                 passwordPanelCheck = id; 

chimera/resources/localized/English.lproj/alert.nib/info.nib

@@ -3,10 +3,10 @@
 <plist version="0.9">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>44 234 356 301 0 0 1024 746 </string>
+	<string>285 97 356 301 0 0 1024 746 </string>
 	<key>IBFramework Version</key>
 	<string>248.0</string>
 	<key>IBSystem Version</key>
-	<string>5S60</string>
+	<string>5Q125</string>
 </dict>
 </plist>

chimera/src/browser/nsAlertController.h

@@ -64,6 +64,7 @@
     IBOutlet id passwordPanelText;
     IBOutlet id passwordPanelInput;
     IBOutlet id securityMismatchPanel;
+    IBOutlet id expiredCertPanel;
     IBOutlet id securityUnknownPanel;
     IBOutlet id usernamePanel;
     IBOutlet id usernamePanelCheck;
@@ -94,6 +95,7 @@
 - (BOOL)promptPassword:(NSWindow*)parent title:(NSString*)title text:(NSString*)text passwordText:(NSMutableString*)passwordText checkMsg:(NSString*)checkMsg checkValue:(BOOL*)checkValue doCheck:(BOOL)doCheck;
 
 - (BOOL)badCert:(NSWindow*)parent;
+- (BOOL)expiredCert:(NSWindow*)parent;
 - (int)unknownCert:(NSWindow*)parent;
 
 @end

chimera/src/browser/nsAlertController.mm

@@ -276,6 +276,15 @@
   return (result == 1);
 }
 
+- (BOOL)expiredCert:(NSWindow*)parent
+{
+  int result = [NSApp runModalForWindow:expiredCertPanel relativeToWindow:parent];
+  [expiredCertPanel close];
+
+  return (result == 1);
+}
+
+
 - (int)unknownCert:(NSWindow*)parent
 {
   int result = [NSApp runModalForWindow:securityUnknownPanel relativeToWindow:parent];

chimera/src/embedding/CHBrowserService.mm

@@ -650,7 +650,7 @@ nsCocoaBrowserService::CertExpired(nsITransportSecurityInfo *socketInfo,
   // HACK: there is no way to get which window this is for from the API. The
   // security team in mozilla just cheats and assumes the frontmost window so
   // that's what we'll do. Yes, it's wrong. Yes, it's skanky. Oh well.
-  *_retval = (PRBool)[controller badCert:[NSApp mainWindow]];
+  *_retval = (PRBool)[controller certExpired:[NSApp mainWindow]];
   
   return NS_OK;
 }