diff options
| author | Valentin Kuznetsov <[email protected]> | 2013-03-21 08:55:03 -0400 |
|---|---|---|
| committer | Valentin Kuznetsov <[email protected]> | 2013-03-21 08:55:03 -0400 |
| commit | da12f246a95df3f6346f8bf9e741d139e4a60f4a (patch) | |
| tree | aa712e78ef4a229f40a33f664af0435b7f22f054 /lib/ssl | |
| parent | f285ee66678ae8761dc82b5ba0c023dd759091fc (diff) | |
| download | otp-da12f246a95df3f6346f8bf9e741d139e4a60f4a.tar.gz otp-da12f246a95df3f6346f8bf9e741d139e4a60f4a.tar.bz2 otp-da12f246a95df3f6346f8bf9e741d139e4a60f4a.zip | |
Fix ssl_connection to support reading proxy/chain certificates
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/src/ssl_connection.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl_connection.erl b/lib/ssl/src/ssl_connection.erl index 4d29ecce7a..2ac5e8ebb2 100644 --- a/lib/ssl/src/ssl_connection.erl +++ b/lib/ssl/src/ssl_connection.erl @@ -1151,7 +1151,7 @@ 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), + [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 +1159,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 -> |