diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 14:22:56 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-05-25 14:22:56 -0700 |
commit | 16e3d7ebf56731c5e9ff40b92eff427316c65103 (patch) | |
tree | 62552614f1314f4d3bb96ef133b9659bdae89e16 /indra/newview/llsecapi.cpp | |
parent | 1bd6061ff57a46293d962adf8ffa5326f87a3566 (diff) | |
parent | a91d10dc1806d1931c7f1361bfcf70df59d982d5 (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) { |