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

Unified Diff: net/android/network_library.h

Issue 1742873002: Switch //net to the new SPKI and PKCS#8 APIs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@spki-crypto
Patch Set: tweak keygen_handler_openssl.cc Created 4 years, 10 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/android/keystore_unittest.cc ('k') | net/base/keygen_handler_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/network_library.h
diff --git a/net/android/network_library.h b/net/android/network_library.h
index ddfb5e92eeec4d30fbd8c96cb873f5c104cd1333..827548ac5905d29528b4eab23efde789cddf2566 100644
--- a/net/android/network_library.h
+++ b/net/android/network_library.h
@@ -36,15 +36,10 @@ void AddTestRootCertificate(const uint8_t* cert, size_t len);
// Removes all root certificates added by |AddTestRootCertificate| calls.
void ClearTestRootCertificates();
-// Helper for the <keygen> handler. Passes the DER-encoded key pair via
-// JNI to the Credentials store. Note that the public key must be a DER
-// encoded SubjectPublicKeyInfo (X.509), as returned by i2d_PUBKEY()
-// (and *not* i2d_PublicKey(), which returns a PKCS#1 key).
-//
-// Also, the private key must be in PKCS#8 format, as returned by
-// i2d_PKCS8_PRIV_KEY_INFO(EVP_PKEY2PKCS8(pkey)), which is a different
-// format than what i2d_PrivateKey() returns, so don't use it either.
-//
+// Helper for the <keygen> handler. Passes the DER-encoded key pair via JNI to
+// the Credentials store. The public key should be a DER-encoded
+// SubjectPublicKeyInfo (X.509) and the private key a DER-encode PrivateKeyInfo
+// (PKCS#8).
bool StoreKeyPair(const uint8_t* public_key,
size_t public_len,
const uint8_t* private_key,
« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/base/keygen_handler_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698