Skip to content

Commit

Permalink
Remove keychain_reauthorize.
Browse files Browse the repository at this point in the history
This code was used when we changed our signing certificate. By now, all
Keychain entries have been migrated to the new certificate. If we ever need
this again, we can resurrect it from version control history.

BUG=347622
R=jochen@chromium.org

Review URL: https://codereview.chromium.org/183713003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254132 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
mark@chromium.org committed Feb 28, 2014
1 parent 2d4e5f7 commit c2391fc
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 733 deletions.
31 changes: 0 additions & 31 deletions chrome/browser/chrome_browser_main_mac.mm
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "chrome/browser/browser_process.h"
#import "chrome/browser/chrome_browser_application_mac.h"
#include "chrome/browser/mac/install_from_dmg.h"
#include "chrome/browser/mac/keychain_reauthorize.h"
#import "chrome/browser/mac/keystone_glue.h"
#include "chrome/browser/metrics/metrics_service.h"
#include "chrome/common/chrome_paths.h"
Expand All @@ -32,17 +31,6 @@

namespace {

// Some users rarely restart Chrome, so they might never get a chance to run
// the at-launch KeychainReauthorize. To account for them, there's also an
// at-update KeychainReauthorize option, which runs from .keystone_install for
// users on a user Keystone ticket. This operation may make sense for a period
// of time after the application switches to being signed by the new
// certificate, as long as the at-update stub executable is still signed by
// the old one.
NSString* const kKeychainReauthorizeAtUpdatePref =
@"KeychainReauthorizeAtUpdateMay2012";
const int kKeychainReauthorizeAtUpdateMaxTries = 3;

// This is one enum instead of two so that the values can be correlated in a
// histogram.
enum CatSixtyFour {
Expand Down Expand Up @@ -162,25 +150,6 @@ void RecordCatSixtyFour() {
}

void ChromeBrowserMainPartsMac::PreEarlyInitialization() {
if (parsed_command_line().HasSwitch(switches::kKeychainReauthorize)) {
if (base::mac::AmIBundled()) {
LOG(FATAL) << "Inappropriate process type for Keychain reauthorization";
}

// Do Keychain reauthorization at the time of update installation. This
// gets three chances to run. If the first or second try doesn't complete
// successfully (crashes or is interrupted for any reason), there will be
// another chance. Once this step completes successfully, it should never
// have to run again.
//
// This is kicked off by a special stub executable during an automatic
// update. See chrome/installer/mac/keychain_reauthorize_main.cc.
chrome::KeychainReauthorizeIfNeeded(kKeychainReauthorizeAtUpdatePref,
kKeychainReauthorizeAtUpdateMaxTries);

exit(0);
}

ChromeBrowserMainPartsPosix::PreEarlyInitialization();

if (base::mac::WasLaunchedAsHiddenLoginItem()) {
Expand Down
51 changes: 0 additions & 51 deletions chrome/browser/mac/keychain_reauthorize.h

This file was deleted.

Loading

0 comments on commit c2391fc

Please sign in to comment.