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

Unified Diff: net/cert/cert_database_openssl.cc

Issue 2363653002: Cleanup unreachable cert adding code (Closed)
Patch Set: Rebased Created 4 years, 2 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 | « net/cert/cert_database_nss.cc ('k') | net/cert/cert_database_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/cert_database_openssl.cc
diff --git a/net/cert/cert_database_openssl.cc b/net/cert/cert_database_openssl.cc
index c92c2bc5321d71c7aecd95b6b561f7f9bb327a2a..35048d04ff6091b1a9f641c5e500faca9d40839f 100644
--- a/net/cert/cert_database_openssl.cc
+++ b/net/cert/cert_database_openssl.cc
@@ -4,15 +4,7 @@
#include "net/cert/cert_database.h"
-#include <openssl/evp.h>
-#include <openssl/x509.h>
-
-#include "base/logging.h"
#include "base/observer_list_threadsafe.h"
-#include "net/base/crypto_module.h"
-#include "net/base/net_errors.h"
-#include "net/base/openssl_private_key_store.h"
-#include "net/cert/x509_certificate.h"
namespace net {
@@ -22,37 +14,4 @@ CertDatabase::CertDatabase()
CertDatabase::~CertDatabase() {}
-// This method is used to check a client certificate before trying to
-// install it on the system, which will happen later by calling
-// AddUserCert() below.
-//
-// On the Linux/OpenSSL build, there is simply no system keystore, but
-// OpenSSLPrivateKeyStore() implements a small in-memory store for
-// (public/private) key pairs generated through keygen.
-//
-// Try to check for a private key in the in-memory store to check
-// for the case when the browser is trying to install a server-generated
-// certificate from a <keygen> exchange.
-int CertDatabase::CheckUserCert(X509Certificate* cert) {
- if (!cert)
- return ERR_CERT_INVALID;
- if (cert->HasExpired())
- return ERR_CERT_DATE_INVALID;
-
- // X509_PUBKEY_get() transfers ownership, not X509_get_X509_PUBKEY()
- bssl::UniquePtr<EVP_PKEY> public_key(
- X509_PUBKEY_get(X509_get_X509_PUBKEY(cert->os_cert_handle())));
-
- if (!OpenSSLPrivateKeyStore::HasPrivateKey(public_key.get()))
- return ERR_NO_PRIVATE_KEY_FOR_CERT;
-
- return OK;
-}
-
-int CertDatabase::AddUserCert(X509Certificate* cert) {
- // There is no certificate store on the Linux/OpenSSL build.
- NOTIMPLEMENTED();
- return ERR_NOT_IMPLEMENTED;
-}
-
} // namespace net
« no previous file with comments | « net/cert/cert_database_nss.cc ('k') | net/cert/cert_database_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698