diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-03-26 15:29:20 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-03-26 15:29:20 +0100 |
| commit | 4ac96f788dbc5df0a1ecc60f5291b5f65c4b6481 (patch) | |
| tree | 8a992c06271b68bc0c8f018fb5ae8a317537bbd4 | |
| parent | 618d8907ece11d07aae5f80126ef20a6d00a9fa7 (diff) | |
| parent | e6a695bc61b262cebecf9086058be306a13a0043 (diff) | |
| download | otp-4ac96f788dbc5df0a1ecc60f5291b5f65c4b6481.tar.gz otp-4ac96f788dbc5df0a1ecc60f5291b5f65c4b6481.tar.bz2 otp-4ac96f788dbc5df0a1ecc60f5291b5f65c4b6481.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 4d29ecce7a..4f241ecc0a 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1151,7 +1151,9 @@ init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHan init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, CertFile, client) -> try - [OwnCert] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle), + %% Ignoring potential proxy-certificates see: + %% http://dev.globus.org/wiki/Security/ProxyFileFormat + [OwnCert|_] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle), {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, OwnCert} catch _Error:_Reason -> {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheHandle, undefined} @@ -1159,7 +1161,7 @@ init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHan init_certificates(undefined, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, CertFile, server) -> try - [OwnCert] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle), + [OwnCert|_] = ssl_certificate:file_to_certificats(CertFile, PemCacheHandle), {ok, CertDbRef, CertDbHandle, FileRefHandle, PemCacheHandle, CacheRef, OwnCert} catch _:Reason -> |