diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-21 15:00:07 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-21 15:00:07 +0300 |
| commit | bcdb1536c1248f41feb51542e523ca7c763542ef (patch) | |
| tree | 982577300d755e8db0a8f45af1c2ec09b15f90d4 /indra/newview/llsecapi.cpp | |
| parent | 6dc2f859fe60feffa92f1377cff8888ba0b47341 (diff) | |
| parent | 9eaf8eaf729193542f2b766eba5cbc624806a53f (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsecapi.cpp')
| -rw-r--r-- | indra/newview/llsecapi.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llsecapi.cpp b/indra/newview/llsecapi.cpp index 89b799f297..1caeec5b04 100644 --- a/indra/newview/llsecapi.cpp +++ b/indra/newview/llsecapi.cpp @@ -121,7 +121,10 @@ int secapiSSLCertVerifyCallback(X509_STORE_CTX *ctx, void *param) validation_params[CERT_HOSTNAME] = uri.hostName(); try { - chain->validate(VALIDATION_POLICY_SSL, store, validation_params); + // we rely on libcurl to validate the hostname, as libcurl does more extensive validation + // leaving our hostname validation call mechanism for future additions with respect to + // OS native (Mac keyring, windows CAPI) validation. + chain->validate(VALIDATION_POLICY_SSL & (~VALIDATION_POLICY_HOSTNAME), store, validation_params); } catch (LLCertValidationTrustException& cert_exception) { |