Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(707)

Unified Diff: main.cc

Issue 2833006: Eliminate stale pkcs11 certificate handler implementations. (Closed) Base URL: ssh://git@chromiumos-git/entd.git
Patch Set: Changed default pkcs11 mode and updated tests. Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « entd.cc ('k') | pkcs11.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: main.cc
diff --git a/main.cc b/main.cc
index 0e147fa2f0ac68e6fdfc0c4836f02f579b43c6ca..bc14d69994e123afff516660de845e5b4befd59c 100644
--- a/main.cc
+++ b/main.cc
@@ -46,7 +46,6 @@ static const char *kUtility = "utility";
// Specify how to setup the pkcs11 interface
static const char *kPkcs11 = "pkcs11";
-static const char *kOpenSSLConf = "openssl-conf";
// Root CA for HTTPS requests.
static const char *kRootCAFile = "root-ca-file";
@@ -131,7 +130,6 @@ int main(int argc, char** argv) {
std::string username = cl->GetSwitchValueASCII(switches::kUsername);
std::string root_ca_file = cl->GetSwitchValueASCII(switches::kRootCAFile);
std::string pkcs11_mode = cl->GetSwitchValueASCII(switches::kPkcs11);
- std::string openssl_conf = cl->GetSwitchValueASCII(switches::kOpenSSLConf);
// Get file paths from a valid policy extension if it exists
std::string extension_path;
@@ -193,9 +191,6 @@ int main(int argc, char** argv) {
if (!pkcs11_mode.empty())
d.SetPkcs11Mode(pkcs11_mode);
- if (!openssl_conf.empty())
- d.SetPkcs11OpenSSLConfig(openssl_conf);
-
uint32_t rv = d.Run();
LOG(INFO) << "Exiting entd with code: " << rv;
return rv;
« no previous file with comments | « entd.cc ('k') | pkcs11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698