diff options
-rw-r--r-- | crypto/compat/ui_openssl_win.c | 4 | ||||
-rw-r--r-- | m4/check-os-options.m4 | 2 | ||||
-rwxr-xr-x | tap-driver.sh | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/crypto/compat/ui_openssl_win.c b/crypto/compat/ui_openssl_win.c index a8c92f2..09705e4 100644 --- a/crypto/compat/ui_openssl_win.c +++ b/crypto/compat/ui_openssl_win.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * 3. All advertising materials mentioning features or use of this | 20 | * 3. All advertising materials mentioning features or use of this |
21 | * software must display the following acknowledgment: | 21 | * software must display the following acknowledgment: |
22 | * "This product includes software developed by the OpenSSL Project | 22 | * "This product includes software developed by the OpenSSL Project |
23 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | 23 | * for use in the OpenSSL Toolkit. (https://www.openssl.org/)" |
24 | * | 24 | * |
25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | 25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to |
26 | * endorse or promote products derived from this software without | 26 | * endorse or promote products derived from this software without |
@@ -34,7 +34,7 @@ | |||
34 | * 6. Redistributions of any form whatsoever must retain the following | 34 | * 6. Redistributions of any form whatsoever must retain the following |
35 | * acknowledgment: | 35 | * acknowledgment: |
36 | * "This product includes software developed by the OpenSSL Project | 36 | * "This product includes software developed by the OpenSSL Project |
37 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | 37 | * for use in the OpenSSL Toolkit (https://www.openssl.org/)" |
38 | * | 38 | * |
39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | 39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY |
40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index c73709d..77edd14 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 | |||
@@ -22,7 +22,7 @@ case $host_os in | |||
22 | # Don't use arc4random on systems before 10.12 because of | 22 | # Don't use arc4random on systems before 10.12 because of |
23 | # weak seed on failure to open /dev/random, based on latest | 23 | # weak seed on failure to open /dev/random, based on latest |
24 | # public source: | 24 | # public source: |
25 | # http://www.opensource.apple.com/source/Libc/Libc-997.90.3/gen/FreeBSD/arc4random.c | 25 | # https://www.opensource.apple.com/source/Libc/Libc-997.90.3/gen/FreeBSD/arc4random.c |
26 | # | 26 | # |
27 | # We use the presence of getentropy() to detect 10.12. The | 27 | # We use the presence of getentropy() to detect 10.12. The |
28 | # following check take into account that: | 28 | # following check take into account that: |
diff --git a/tap-driver.sh b/tap-driver.sh index fea066f..1e444b2 100755 --- a/tap-driver.sh +++ b/tap-driver.sh | |||
@@ -131,9 +131,8 @@ fi | |||
131 | # expects on its last input line (which is displayed below by the | 131 | # expects on its last input line (which is displayed below by the |
132 | # last `echo $?' statement), and would thus die reporting an internal | 132 | # last `echo $?' statement), and would thus die reporting an internal |
133 | # error. | 133 | # error. |
134 | # For more information, see the Autoconf manual and the threads: | 134 | # For more information, see the Autoconf manual and the thread: |
135 | # <https://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html> | 135 | # <https://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html> |
136 | # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html> | ||
137 | trap : 1 3 2 13 15 | 136 | trap : 1 3 2 13 15 |
138 | if test $merge -gt 0; then | 137 | if test $merge -gt 0; then |
139 | exec 2>&1 | 138 | exec 2>&1 |
@@ -464,7 +463,7 @@ function get_test_exit_message(status) | |||
464 | # in $? an exit status of 256+n instead of the more standard 128+n. | 463 | # in $? an exit status of 256+n instead of the more standard 128+n. |
465 | # Apparently, both behaviours are allowed by POSIX (2008), so be | 464 | # Apparently, both behaviours are allowed by POSIX (2008), so be |
466 | # prepared to handle them both. See also Austing Group report ID | 465 | # prepared to handle them both. See also Austing Group report ID |
467 | # 0000051 <http://www.austingroupbugs.net/view.php?id=51> | 466 | # 0000051 <https://www.austingroupbugs.net/view.php?id=51> |
468 | exit_details = sprintf(" (terminated by signal %d?)", status - 256) | 467 | exit_details = sprintf(" (terminated by signal %d?)", status - 256) |
469 | else | 468 | else |
470 | # Never seen in practice. | 469 | # Never seen in practice. |