diff options
| author | Selim Gurun <sgurun@google.com> | 2011-12-09 14:57:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:57:58 -0800 |
| commit | fcb1cf52f4e77de290b17b3c11b60ef2f486ee59 (patch) | |
| tree | df08f42fb13d09fb00df47cd9ea8e5e540c11798 /Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h | |
| parent | 46ded0d896cca693053fe2459c1930de95b65cd9 (diff) | |
| parent | aa81668752d33ae7a345626ab61f1ea9fc931392 (diff) | |
| download | external_webkit-fcb1cf52f4e77de290b17b3c11b60ef2f486ee59.zip external_webkit-fcb1cf52f4e77de290b17b3c11b60ef2f486ee59.tar.gz external_webkit-fcb1cf52f4e77de290b17b3c11b60ef2f486ee59.tar.bz2 | |
am aa816687: Merge "Prevent native crashes on client cert request" into ics-mr1
* commit 'aa81668752d33ae7a345626ab61f1ea9fc931392':
Prevent native crashes on client cert request
Diffstat (limited to 'Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h index 5f03339..4463dfb 100644 --- a/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h +++ b/Source/WebKit/android/WebCoreSupport/WebUrlLoaderClient.h @@ -74,7 +74,6 @@ public: void cancelAuth(); void proceedSslCertError(); void cancelSslCertError(int cert_error); - void sslClientCert(EVP_PKEY* pkey, net::X509Certificate* chain); typedef void CallbackFunction(void*); @@ -92,6 +91,8 @@ public: void willSendRequest(PassOwnPtr<WebResponse>); void authRequired(scoped_refptr<net::AuthChallengeInfo>, bool firstTime, bool suppressDialog); void reportSslCertError(int cert_error, net::X509Certificate* cert); + + void sslClientCert(EVP_PKEY* pkey, net::X509Certificate* chain); void requestClientCert(net::SSLCertRequestInfo* cert); // Handle to the chrome IO thread |