diff options
| author | Sam Varshavchik | 2015-04-25 22:49:58 -0400 |
|---|---|---|
| committer | Sam Varshavchik | 2015-04-25 22:49:58 -0400 |
| commit | aec32f54c031e00da5cda1c2384d8b63e742f149 (patch) | |
| tree | 2e161fa3565d5d8e01eca7410edfe723b5102ee5 | |
| parent | 4d6b3cbc45d313e763da26f55c56993553edcd0d (diff) | |
| download | courier-libs-aec32f54c031e00da5cda1c2384d8b63e742f149.tar.bz2 | |
Make dhparams compatible with libressl
| -rw-r--r-- | imap/ChangeLog | 8 | ||||
| -rw-r--r-- | imap/mkdhparams.in | 17 | ||||
| -rw-r--r-- | sqwebmail/ChangeLog | 4 |
3 files changed, 25 insertions, 4 deletions
diff --git a/imap/ChangeLog b/imap/ChangeLog index f773664..95e020f 100644 --- a/imap/ChangeLog +++ b/imap/ChangeLog @@ -1,3 +1,11 @@ +4.16.1 + +2015-04-25 Giovanni Bechis <giovanni@openbsd.org> + + * maildircache.c: fix use after free. + + * mkdhparams: make compatible with libressl + 2015-03-04 Sam Varshavchik <mrsam@courier-mta.com> * Handle 01-Jan-1970 for date-based searches. diff --git a/imap/mkdhparams.in b/imap/mkdhparams.in index 89ed1dd..04afcca 100644 --- a/imap/mkdhparams.in +++ b/imap/mkdhparams.in @@ -7,6 +7,12 @@ # Override from the environment +@OPENSSL@ version | grep LibreSSL 1>/dev/null +if test $? = 0 +then + LIBRESSL=1 +fi + if test "$TLS_DHPARAMS" = "" then TLS_DHPARAMS="@certsdir@/dhparams.pem" @@ -36,9 +42,14 @@ then BITS=2048 fi - dd if=@RANDOMV@ of=$TLS_DHPARAMS.rand.tmp count=1 2>/dev/null - @OPENSSL@ dhparam -rand $TLS_DHPARAMS.rand.tmp -outform PEM $BITS >$TLS_DHPARAMS.tmp - rm -f $TLS_DHPARAMS.rand.tmp + if test "$LIBRESSL" = 0 + then + dd if=@RANDOMV@ of=$TLS_DHPARAMS.rand.tmp count=1 2>/dev/null + @OPENSSL@ dhparam -rand $TLS_DHPARAMS.rand.tmp -outform PEM $BITS >$TLS_DHPARAMS.tmp + rm -f $TLS_DHPARAMS.rand.tmp + else + @OPENSSL@ dhparam -outform PEM $BITS >$TLS_DHPARAMS.tmp + fi mv -f $TLS_DHPARAMS.tmp $TLS_DHPARAMS else if test "$BITS" = "" diff --git a/sqwebmail/ChangeLog b/sqwebmail/ChangeLog index 1e9c934..7891515 100644 --- a/sqwebmail/ChangeLog +++ b/sqwebmail/ChangeLog @@ -1,9 +1,11 @@ 5.8.2 -2015-04-24 Giovanni Bechis <giovanni@openbsd.org> +2015-04-25 Giovanni Bechis <giovanni@openbsd.org> * maildircache.c: fix use after free. + * mkdhparams: make compatible with libressl + 2015-03-03 Sam Varshavchik <mrsam@courier-mta.com> * Recognize 01-Jan-1970 as a valid RFC 822 date. |