diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-05-20 14:38:37 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-05-20 14:38:37 -0600 |
| commit | b8fa70502c5bc7bdb9dba7fde4251424a9041c9e (patch) | |
| tree | bd0f2d943fe615b089406e6e8896c3aadc72c10b /indra/newview/llsecapi.cpp | |
| parent | 46309f558ed1ce459d11aa76de35679fa81a4823 (diff) | |
| parent | 5e353cbf86693ad18b0c9a3f75234c1fa6378005 (diff) | |
Merge
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) { |