diff options
| author | Dan Gudmundsson <[email protected]> | 2010-03-19 12:00:00 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-08-20 08:48:19 +0200 |
| commit | 4b4409332636b70fb22c3bcaf7e0ba5ef1538bf7 (patch) | |
| tree | 8c072c6259f79ac26d824ed607518116cddc4256 /lib/ssl | |
| parent | cc7d994b9c8db2a8889049e738f43e4f6fbf1d99 (diff) | |
| download | otp-4b4409332636b70fb22c3bcaf7e0ba5ef1538bf7.tar.gz otp-4b4409332636b70fb22c3bcaf7e0ba5ef1538bf7.tar.bz2 otp-4b4409332636b70fb22c3bcaf7e0ba5ef1538bf7.zip | |
ssl: Patch 1110
OTP-8510 Fixed a crash in the certificate certification part.
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/doc/src/notes.xml | 15 | ||||
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 5 | ||||
| -rw-r--r-- | lib/ssl/src/ssl_certificate_db.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 5 |
4 files changed, 23 insertions, 4 deletions
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml index 4265445d23..2dd11bc88e 100644 --- a/lib/ssl/doc/src/notes.xml +++ b/lib/ssl/doc/src/notes.xml @@ -31,6 +31,21 @@ <p>This document describes the changes made to the SSL application. </p> +<section><title>SSL 3.10.9</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fixed a crash in the certificate certification part.</p> + <p> + Own Id: OTP-8510 Aux Id: seq11525 </p> + </item> + </list> + </section> + +</section> + <section><title>SSL 3.10.8</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index 3aea2428c9..fdda65021d 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -8,7 +8,8 @@ {"3.10.4", [{restart_application, ssl}]}, {"3.10.5", [{restart_application, ssl}]}, {"3.10.6", [{restart_application, ssl}]}, - {"3.10.7", [{restart_application, ssl}]} + {"3.10.7", [{restart_application, ssl}]}, + {"3.10.8", [{restart_application, ssl}]} ], [ {"3.10", [{restart_application, ssl}]}, @@ -18,6 +19,6 @@ {"3.10.4", [{restart_application, ssl}]}, {"3.10.5", [{restart_application, ssl}]}, {"3.10.6", [{restart_application, ssl}]}, - {"3.10.7", [{restart_application, ssl}]} + {"3.10.8", [{restart_application, ssl}]} ]}. diff --git a/lib/ssl/src/ssl_certificate_db.erl b/lib/ssl/src/ssl_certificate_db.erl index adae92530a..b8c3c6f6b7 100644 --- a/lib/ssl/src/ssl_certificate_db.erl +++ b/lib/ssl/src/ssl_certificate_db.erl @@ -159,6 +159,8 @@ issuer_candidate(no_candidate) -> case ets:first(Db) of '$end_of_table' -> no_more_candidates; + {file, _} = Key -> + issuer_candidate(Key); Key -> [Cert] = lookup(Key, Db), {Key, Cert} diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 7c038e5818..bf67fcd257 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -17,9 +17,10 @@ # %CopyrightEnd% # -SSL_VSN = 3.10.8 +SSL_VSN = 3.10.9 +TICKETS = OTP-8510 -TICKETS = OTP-8372 OTP-8441 OTP-8459 +#TICKETS_3.10.8 = OTP-8372 OTP-8441 OTP-8459 #TICKETS_3.10.7 = OTP-8260 OTP-8218 OTP-8250 #TICKETS_3.10.6 = OTP-8275 |