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

Side by Side Diff: net/android/network_library.cc

Issue 27500004: Listen for new system certificates. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Follow review. Created 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/android/network_library.h" 5 #include "net/android/network_library.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
(...skipping 19 matching lines...) Expand all
30 30
31 ScopedJavaLocalRef<jobjectArray> chain_byte_array = 31 ScopedJavaLocalRef<jobjectArray> chain_byte_array =
32 ToJavaArrayOfByteArray(env, cert_chain); 32 ToJavaArrayOfByteArray(env, cert_chain);
33 DCHECK(!chain_byte_array.is_null()); 33 DCHECK(!chain_byte_array.is_null());
34 34
35 ScopedJavaLocalRef<jstring> auth_string = 35 ScopedJavaLocalRef<jstring> auth_string =
36 ConvertUTF8ToJavaString(env, auth_type); 36 ConvertUTF8ToJavaString(env, auth_type);
37 DCHECK(!auth_string.is_null()); 37 DCHECK(!auth_string.is_null());
38 38
39 jint result = Java_AndroidNetworkLibrary_verifyServerCertificates( 39 jint result = Java_AndroidNetworkLibrary_verifyServerCertificates(
40 env, chain_byte_array.obj(), auth_string.obj()); 40 env, GetApplicationContext(), chain_byte_array.obj(), auth_string.obj());
41 41
42 return static_cast<CertVerifyResultAndroid>(result); 42 return static_cast<CertVerifyResultAndroid>(result);
43 } 43 }
44 44
45 void AddTestRootCertificate(const uint8* cert, size_t len) { 45 void AddTestRootCertificate(const uint8* cert, size_t len) {
46 JNIEnv* env = AttachCurrentThread(); 46 JNIEnv* env = AttachCurrentThread();
47 ScopedJavaLocalRef<jbyteArray> cert_array = ToJavaByteArray(env, cert, len); 47 ScopedJavaLocalRef<jbyteArray> cert_array = ToJavaByteArray(env, cert, len);
48 DCHECK(!cert_array.is_null()); 48 DCHECK(!cert_array.is_null());
49 Java_AndroidNetworkLibrary_addTestRootCertificate(env, cert_array.obj()); 49 Java_AndroidNetworkLibrary_addTestRootCertificate(
50 env, GetApplicationContext(), cert_array.obj());
50 } 51 }
51 52
52 void ClearTestRootCertificates() { 53 void ClearTestRootCertificates() {
53 JNIEnv* env = AttachCurrentThread(); 54 JNIEnv* env = AttachCurrentThread();
54 Java_AndroidNetworkLibrary_clearTestRootCertificates(env); 55 Java_AndroidNetworkLibrary_clearTestRootCertificates(env,
56 GetApplicationContext());
55 } 57 }
56 58
57 bool StoreKeyPair(const uint8* public_key, 59 bool StoreKeyPair(const uint8* public_key,
58 size_t public_len, 60 size_t public_len,
59 const uint8* private_key, 61 const uint8* private_key,
60 size_t private_len) { 62 size_t private_len) {
61 JNIEnv* env = AttachCurrentThread(); 63 JNIEnv* env = AttachCurrentThread();
62 ScopedJavaLocalRef<jbyteArray> public_array = 64 ScopedJavaLocalRef<jbyteArray> public_array =
63 ToJavaByteArray(env, public_key, public_len); 65 ToJavaByteArray(env, public_key, public_len);
64 ScopedJavaLocalRef<jbyteArray> private_array = 66 ScopedJavaLocalRef<jbyteArray> private_array =
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 *result = ConvertJavaStringToUTF8(ret); 115 *result = ConvertJavaStringToUTF8(ret);
114 return true; 116 return true;
115 } 117 }
116 118
117 bool RegisterNetworkLibrary(JNIEnv* env) { 119 bool RegisterNetworkLibrary(JNIEnv* env) {
118 return RegisterNativesImpl(env); 120 return RegisterNativesImpl(env);
119 } 121 }
120 122
121 } // namespace android 123 } // namespace android
122 } // namespace net 124 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698