diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 05:37:18 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-15 05:37:18 +0000 |
| commit | 29febdd448669aaae6b76bb8fe11cdd07716e9f5 (patch) | |
| tree | 748ce1663fadb86ac101a5177d16cedb197e252e /net/third_party/nss/ssl/ssl.h | |
| parent | 61aba5ba47c555b189ec2115f75449a4944f2120 (diff) | |
| download | chromium_src-29febdd448669aaae6b76bb8fe11cdd07716e9f5.zip chromium_src-29febdd448669aaae6b76bb8fe11cdd07716e9f5.tar.gz chromium_src-29febdd448669aaae6b76bb8fe11cdd07716e9f5.tar.bz2 | |
Ensure the patched NSS libssl used on Win and Mac behaves the same as upstream when handling client auth
When configuring client auth callbacks, ensure that the modified libssl used
on Win/Mac behaves the same as a stock upstream libssl, in that the NSS
client auth callback function is called if it is set. The previous behaviour
was to only call the platform-specific client auth hook, but that relies on
applications being aware of the platform-specific client auth patch, which
is not desirable for WebRTC.
BUG=158504
Review URL: https://chromiumcodereview.appspot.com/11359197
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167868 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/third_party/nss/ssl/ssl.h')
| -rw-r--r-- | net/third_party/nss/ssl/ssl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/third_party/nss/ssl/ssl.h b/net/third_party/nss/ssl/ssl.h index a656443..8a669d1 100644 --- a/net/third_party/nss/ssl/ssl.h +++ b/net/third_party/nss/ssl/ssl.h @@ -541,6 +541,9 @@ typedef SECStatus (PR_CALLBACK *SSLGetPlatformClientAuthData)(void *arg, /* * Set the client side callback for SSL to retrieve user's private key * and certificate. + * Note: If a platform client auth callback is set, the callback configured by + * SSL_GetClientAuthDataHook, if any, will not be called. + * * fd - the file descriptor for the connection in question * f - the application's callback that delivers the key and cert * a - application specific data |