summaryrefslogtreecommitdiff
path: root/indra/newview/llsecapi.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-25 11:41:33 -0700
committerJames Cook <james@lindenlab.com>2010-05-25 11:41:33 -0700
commita91d10dc1806d1931c7f1361bfcf70df59d982d5 (patch)
tree20f2940d888aaf71c54ff1e7834cbf79a3617216 /indra/newview/llsecapi.cpp
parentd6ea42984553b7adb6f26cf2ed094d32e36814d2 (diff)
parentf682c996d28c3841b6709f8fc67ba443bfcd1926 (diff)
Merge
Diffstat (limited to 'indra/newview/llsecapi.cpp')
-rw-r--r--indra/newview/llsecapi.cpp5
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)
{