Skip to content

Commit 4d97cd9

Browse files
bagajjalbagajjal
authored
Upgrade to V3.4.3 (#11)
1 parent e9e6ea5 commit 4d97cd9

33 files changed

+424
-418
lines changed

‎ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ history is also available from Git.
2828

2929
LibreSSL Portable Release Notes:
3030

31+
3.4.3 - Security release
32+
33+
* A malicious certificate can cause an infinite loop.
34+
Reported by and fix from Tavis Ormandy and David Benjamin, Google.
35+
3136
3.4.2 - Security fix
3237

3338
* In some situations the X.509 verifier would discard an error on an

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3.4.2.0
1+
3.4.3.0
22

‎configure

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.69 for libressl 3.4.2.
3+
# Generated by GNU Autoconf 2.69 for libressl 3.4.3.
44
#
55
#
66
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
587587
# Identity of this package.
588588
PACKAGE_NAME='libressl'
589589
PACKAGE_TARNAME='libressl'
590-
PACKAGE_VERSION='3.4.2'
591-
PACKAGE_STRING='libressl 3.4.2'
590+
PACKAGE_VERSION='3.4.3'
591+
PACKAGE_STRING='libressl 3.4.3'
592592
PACKAGE_BUGREPORT=''
593593
PACKAGE_URL=''
594594

@@ -1452,7 +1452,7 @@ if test "$ac_init_help" = "long"; then
14521452
# Omit some internal or obsolete options to make the list less imposing.
14531453
# This message is too long to be a string in the A/UX 3.1 sh.
14541454
cat <<_ACEOF
1455-
\`configure' configures libressl 3.4.2 to adapt to many kinds of systems.
1455+
\`configure' configures libressl 3.4.3 to adapt to many kinds of systems.
14561456
14571457
Usage: $0 [OPTION]... [VAR=VALUE]...
14581458
@@ -1523,7 +1523,7 @@ fi
15231523

15241524
if test -n "$ac_init_help"; then
15251525
case $ac_init_help in
1526-
short | recursive ) echo "Configuration of libressl 3.4.2:";;
1526+
short | recursive ) echo "Configuration of libressl 3.4.3:";;
15271527
esac
15281528
cat <<\_ACEOF
15291529
@@ -1641,7 +1641,7 @@ fi
16411641
test -n "$ac_init_help" && exit $ac_status
16421642
if $ac_init_version; then
16431643
cat <<\_ACEOF
1644-
libressl configure 3.4.2
1644+
libressl configure 3.4.3
16451645
generated by GNU Autoconf 2.69
16461646
16471647
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2189,7 +2189,7 @@ cat >config.log <<_ACEOF
21892189
This file contains any messages produced by compilers while
21902190
running configure, to aid debugging if configure makes a mistake.
21912191
2192-
It was created by libressl $as_me 3.4.2, which was
2192+
It was created by libressl $as_me 3.4.3, which was
21932193
generated by GNU Autoconf 2.69. Invocation command line was
21942194
21952195
$ $0 $@
@@ -3125,7 +3125,7 @@ fi
31253125

31263126
# Define the identity of the package.
31273127
PACKAGE='libressl'
3128-
VERSION='3.4.2'
3128+
VERSION='3.4.3'
31293129

31303130

31313131
cat >>confdefs.h <<_ACEOF
@@ -14949,7 +14949,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1494914949
# report actual input values of CONFIG_FILES etc. instead of their
1495014950
# values after options handling.
1495114951
ac_log="
14952-
This file was extended by libressl $as_me 3.4.2, which was
14952+
This file was extended by libressl $as_me 3.4.3, which was
1495314953
generated by GNU Autoconf 2.69. Invocation command line was
1495414954
1495514955
CONFIG_FILES = $CONFIG_FILES
@@ -15006,7 +15006,7 @@ _ACEOF
1500615006
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1500715007
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1500815008
ac_cs_version="\\
15009-
libressl config.status 3.4.2
15009+
libressl config.status 3.4.3
1501015010
configured by $0, generated by GNU Autoconf 2.69,
1501115011
with options \\"\$ac_cs_config\\"
1501215012

‎crypto/aes/aes-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/aes/aes-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/aes/aes-masm-x86_64.S.tmp" 2

‎crypto/aes/aesni-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/aes/aesni-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/aes/aesni-masm-x86_64.S.tmp" 2

‎crypto/aes/aesni-sha1-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/aes/aesni-sha1-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/aes/aesni-sha1-masm-x86_64.S.tmp" 2

‎crypto/aes/bsaes-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/aes/bsaes-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/aes/bsaes-masm-x86_64.S.tmp" 2

‎crypto/aes/vpaes-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/aes/vpaes-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/aes/vpaes-masm-x86_64.S.tmp" 2

‎crypto/bn/bn_sqrt.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -351,21 +351,22 @@ BN_mod_sqrt(BIGNUM *in, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx)
351351
goto vrfy;
352352
}
353353

354-
355-
/* find smallest i such that b^(2^i) = 1 */
356-
i = 1;
357-
if (!BN_mod_sqr(t, b, p, ctx))
358-
goto end;
359-
while (!BN_is_one(t)) {
360-
i++;
361-
if (i == e) {
362-
BNerror(BN_R_NOT_A_SQUARE);
363-
goto end;
354+
/* Find the smallest i with 0 < i < e such that b^(2^i) = 1. */
355+
for (i = 1; i < e; i++) {
356+
if (i == 1) {
357+
if (!BN_mod_sqr(t, b, p, ctx))
358+
goto end;
359+
} else {
360+
if (!BN_mod_sqr(t, t, p, ctx))
361+
goto end;
364362
}
365-
if (!BN_mod_mul(t, t, t, p, ctx))
366-
goto end;
363+
if (BN_is_one(t))
364+
break;
365+
}
366+
if (i >= e) {
367+
BNerror(BN_R_NOT_A_SQUARE);
368+
goto end;
367369
}
368-
369370

370371
/* t := y^2^(e - i - 1) */
371372
if (!BN_copy(t, y))

‎crypto/bn/gf2m-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/bn/gf2m-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/bn/gf2m-masm-x86_64.S.tmp" 2

‎crypto/bn/modexp512-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/bn/modexp512-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/bn/modexp512-masm-x86_64.S.tmp" 2

‎crypto/bn/mont-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/bn/mont-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/bn/mont-masm-x86_64.S.tmp" 2

‎crypto/bn/mont5-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/bn/mont5-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/bn/mont5-masm-x86_64.S.tmp" 2

‎crypto/camellia/cmll-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/camellia/cmll-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/camellia/cmll-masm-x86_64.S.tmp" 2

‎crypto/cpuid-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/cpuid-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/cpuid-masm-x86_64.S.tmp" 2

‎crypto/md5/md5-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/md5/md5-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/md5/md5-masm-x86_64.S.tmp" 2

‎crypto/modes/ghash-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/modes/ghash-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/modes/ghash-masm-x86_64.S.tmp" 2

‎crypto/rc4/rc4-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/rc4/rc4-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/rc4/rc4-masm-x86_64.S.tmp" 2

‎crypto/rc4/rc4-md5-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/rc4/rc4-md5-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/rc4/rc4-md5-masm-x86_64.S.tmp" 2

‎crypto/sha/sha1-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/sha/sha1-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/sha/sha1-masm-x86_64.S.tmp" 2

‎crypto/sha/sha256-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/sha/sha256-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/sha/sha256-masm-x86_64.S.tmp" 2

‎crypto/sha/sha512-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/sha/sha512-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/sha/sha512-masm-x86_64.S.tmp" 2

‎crypto/whrlpool/wp-masm-x86_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; 1 "crypto/whrlpool/wp-masm-x86_64.S.tmp"
22
; 1 "<built-in>" 1
33
; 1 "<built-in>" 3
4-
; 340 "<built-in>" 3
4+
; 343 "<built-in>" 3
55
; 1 "<command line>" 1
66
; 1 "<built-in>" 2
77
; 1 "crypto/whrlpool/wp-masm-x86_64.S.tmp" 2

‎include/openssl/opensslv.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/* $OpenBSD: opensslv.h,v 1.66 2021/09/15 17:14:26 tb Exp $ */
1+
/* $OpenBSD$ */
22
#ifndef HEADER_OPENSSLV_H
33
#define HEADER_OPENSSLV_H
44

55
/* These will change with each release of LibreSSL-portable */
6-
#define LIBRESSL_VERSION_NUMBER 0x3040200fL
6+
#define LIBRESSL_VERSION_NUMBER 0x3040300fL
77
/* ^ Patch starts here */
8-
#define LIBRESSL_VERSION_TEXT "LibreSSL 3.4.2"
8+
#define LIBRESSL_VERSION_TEXT "LibreSSL 3.4.3"
99

1010
/* These will never change */
1111
#define OPENSSL_VERSION_NUMBER 0x20000000L

‎tests/ocsptest.bat

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
@echo off
2-
setlocal enabledelayedexpansion
3-
REM ocspocsp_test_bin.bat
4-
5-
set ocsp_test_bin=%1
6-
set ocsp_test_bin=%ocsp_test_bin:/=\%
7-
if not exist %ocsp_test_bin% exit /b 1
8-
9-
%ocsp_test_bin% www.amazon.com 443 & if !errorlevel! neq 0 exit /b 1
10-
%ocsp_test_bin% cloudflare.com 443 & if !errorlevel! neq 0 exit /b 1
11-
12-
endlocal
1+
@echo off
2+
setlocal enabledelayedexpansion
3+
REM ocspocsp_test_bin.bat
4+
5+
set ocsp_test_bin=%1
6+
set ocsp_test_bin=%ocsp_test_bin:/=\%
7+
if not exist %ocsp_test_bin% exit /b 1
8+
9+
%ocsp_test_bin% www.amazon.com 443 & if !errorlevel! neq 0 exit /b 1
10+
%ocsp_test_bin% cloudflare.com 443 & if !errorlevel! neq 0 exit /b 1
11+
12+
endlocal

‎tests/pq_test.bat

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
@echo off
2-
setlocal enabledelayedexpansion
3-
REM pq_test.bat
4-
5-
set pq_test_bin=%1
6-
set pq_test_bin=%pq_test_bin:/=\%
7-
if not exist %pq_test_bin% exit /b 1
8-
9-
set pq_output=pq_output.txt
10-
if exist %pq_output% del %pq_output%
11-
12-
%pq_test_bin% > %pq_output%
13-
fc /b %pq_output% %srcdir%\pq_expected.txt
14-
15-
endlocal
1+
@echo off
2+
setlocal enabledelayedexpansion
3+
REM pq_test.bat
4+
5+
set pq_test_bin=%1
6+
set pq_test_bin=%pq_test_bin:/=\%
7+
if not exist %pq_test_bin% exit /b 1
8+
9+
set pq_output=pq_output.txt
10+
if exist %pq_output% del %pq_output%
11+
12+
%pq_test_bin% > %pq_output%
13+
fc /b %pq_output% %srcdir%\pq_expected.txt
14+
15+
endlocal

0 commit comments

Comments
 (0)