git.99rst.org Git - openwrt-packages.git/blob

   1 commit 399714287a04d6b453ba95e4a3904a7644827d0b
   2 Author: Emeric Brun <ebrun@haproxy.com>
   3 Date:   Thu Aug 16 15:14:12 2018 +0200
   4
   5     BUG/MEDIUM: ssl: loading dh param from certifile causes unpredictable error.
   6
   7     If the dh parameter is not found, the openssl's error global
   8     stack was not correctly cleared causing unpredictable error
   9     during the following parsing (chain cert parsing for instance).
  10
  11     This patch should be backported in 1.8 (and perhaps 1.7)
  12
  13     (cherry picked from commit e1b4ed4352619f985d7d65f5d95a830ef5775c46)
  14     Signed-off-by: Willy Tarreau <w@1wt.eu>
  15
  16 diff --git a/src/ssl_sock.c b/src/ssl_sock.c
  17 index 9f0ff1f0..9be2fc4c 100644
  18 --- a/src/ssl_sock.c
  19 +++ b/src/ssl_sock.c
  20 @@ -2597,6 +2597,8 @@ end:
  21          if (in)
  22                  BIO_free(in);
  23
  24 +       ERR_clear_error();
  25 +
  26         return dh;
  27  }
  28