Upstream certificate and mime Android implementation.

net/android/network_library.h

Index: net/android/network_library.h
diff --git a/net/android/network_library.h b/net/android/network_library.h
new file mode 100644
index 0000000000000000000000000000000000000000..3a31c9c4b53db0b46e13d92aaec25ce58d44ba56
--- /dev/null
+++ b/net/android/network_library.h
@@ -0,0 +1,51 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef NET_ANDROID_NETWORK_LIBRARY_H_
+#define NET_ANDROID_NETWORK_LIBRARY_H_
+#pragma once
+
+#include <jni.h>

[wtc, 2011/08/09 18:47:22]

Add a blank line to separate the C and C++ system headers.

[michaelbai, 2011/08/11 16:10:18]

Done.

+#include <string>
+#include <vector>
+
+#include "base/basictypes.h"
+
+namespace net {
+namespace android {
+
+enum VerifyResult {
+  VERIFY_OK,
+  VERIFY_BAD_HOSTNAME,
+  VERIFY_NO_TRUSTED_ROOT,
+  VERIFY_INVOCATION_ERROR,
+};

[wtc, 2011/08/09 18:47:22]

Document this enum type.  In particular,
VERIFY_INVOCATION_ERROR should be documented.

"Expired certificate" and "revoked certificate" errors are
not in the VerifyResult enum.  Why?

[michaelbai, 2011/08/11 16:10:18]

Done.

+
+// |cert_chain| is DER encoded chain of certificates, with the server's own
+// certificate listed first.
+// |hostname| is validated against the supplied cert. |auth_type| is as per
+// the Java X509Certificate.checkServerTrusted method.
+
+VerifyResult VerifyX509CertChain(const std::vector<std::string>& cert_chain,
+                                 const std::string& hostname,
+                                 const std::string& auth_type);
+
+// Helper for the <keygen> handler. Passes the DER-encoded key  pair via
+// JNI to the Credentials store.
+bool StoreKeyPair(const uint8* public_key,
+                  size_t public_len,
+                  const uint8* private_key,
+                  size_t private_len);
+
+// Get the mime type (if any) that is associated with the file extension.
+// Returns true if a corresponding mime type exists.
+bool GetMimeTypeFromExtension(const std::string& extension,
+                              std::string* result);
+
+bool RegisterNetworkLibrary(JNIEnv* env);

[wtc, 2011/08/09 18:47:22]

Document this function.

[michaelbai, 2011/08/11 16:10:18]

Done.

+
+}  // namespace android
+}  // namespace net
+
+#endif  // NET_ANDROID_NETWORK_LIBRARY_H_