diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-05-19 17:11:33 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-19 17:11:33 -0700 |
| commit | 1cc4fe44139c8dafb568eddc42b941e6500d23db (patch) | |
| tree | 047eda1aa5df9e5c3fa91280d0e20c2567906c03 /indra | |
| parent | 5dc6043ae8e3e6b8ced0d6d92a6ab09620d3772e (diff) | |
| parent | ca9737d6d6efac7ce9aba1f9686a86b7f6863636 (diff) | |
automated merge
Diffstat (limited to 'indra')
| -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) { |