diff --git a/CHANGES b/CHANGES index 8c6f19356d8791a1b590b2e5db234de52f993ae6..ce9046f8f2a37ade0388758b41370f5508bd22e8 100644 --- a/CHANGES +++ b/CHANGES @@ -7,7 +7,11 @@ https://github.com/openssl/openssl/commits/ and pick the appropriate release branch. - Changes between 1.1.1v and 1.1.1w [xx XXX xxxx] + Changes between 1.1.1w and 1.1.1x [xx XXX xxxx] + + *) + + Changes between 1.1.1v and 1.1.1w [11 Sep 2023] *) Fix POLY1305 MAC implementation corrupting XMM registers on Windows. diff --git a/NEWS b/NEWS index 12ecbf1def2081fd5236f41681612582ca2e5b56..836aede8e5be4fadff0e6bdaa6ffc1895eacdace 100644 --- a/NEWS +++ b/NEWS @@ -5,7 +5,11 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. - Major changes between OpenSSL 1.1.1v and OpenSSL 1.1.1w [under development] + Major changes between OpenSSL 1.1.1w and OpenSSL 1.1.1x [under development] + + o + + Major changes between OpenSSL 1.1.1v and OpenSSL 1.1.1w [11 Sep 2023] o Fix POLY1305 MAC implementation corrupting XMM registers on Windows (CVE-2023-4807) diff --git a/README b/README index f9b6eedebb173377f8fed4fd719c492d7188d788..8c47d7aa39fcc055112860fe7b6c8b134f51c5ed 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - OpenSSL 1.1.1w-dev + OpenSSL 1.1.1x-dev Copyright (c) 1998-2023 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 228dbef40d5ff189f6435b34b90595c10a619c6c..4ab246e987194bb3eb45a90093577697fc600197 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/cms/cms_asn1.c b/crypto/cms/cms_asn1.c index d006ada998963be159f30362dfde3b0c8bd6771a..a62e11ecbd9084dbfd7e5c1ccd08db5c4011f316 100644 --- a/crypto/cms/cms_asn1.c +++ b/crypto/cms/cms_asn1.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h index b275bddf75b25a2fe90f09000b728e92cef4765f..09c0bdfe5a47d55edbdbd8972d857ad8187caff0 100644 --- a/crypto/cms/cms_local.h +++ b/crypto/cms/cms_local.h @@ -1,5 +1,5 @@ /* - * Copyright 2008-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/cms/cms_sd.c b/crypto/cms/cms_sd.c index 708b443704026113d5dd1df7ffd19502c650b6e0..9f67f91297eac4f1cdb6ec2d6208ae9aee1737a3 100644 --- a/crypto/cms/cms_sd.c +++ b/crypto/cms/cms_sd.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index 8f3a9fbaeb977ae8ae99228f5b16040cec2f7564..f6c1c7d177055855ca4677daadf203e552abb319 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/ec/ec_ameth.c b/crypto/ec/ec_ameth.c index c48b7cb7542142956c4e14aee1a0a659cd5c5653..5a63590a9fbd378d941df1433001aa6563b293f0 100644 --- a/crypto/ec/ec_ameth.c +++ b/crypto/ec/ec_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/crypto/poly1305/asm/poly1305-x86_64.pl b/crypto/poly1305/asm/poly1305-x86_64.pl index 801455c639df0ae2bd8cfa71e99afd6fd1dcc77e..5e2bb18f2bacd3ace91d12bbb9f1d0170c33e3d5 100755 --- a/crypto/poly1305/asm/poly1305-x86_64.pl +++ b/crypto/poly1305/asm/poly1305-x86_64.pl @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy diff --git a/crypto/rsa/rsa_ameth.c b/crypto/rsa/rsa_ameth.c index 63efd93798811a940951fb59ea52e3c4d492617c..00ed9820b0d296257eff659a902c51104a01cc19 100644 --- a/crypto/rsa/rsa_ameth.c +++ b/crypto/rsa/rsa_ameth.c @@ -1,5 +1,5 @@ /* - * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2006-2023 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy diff --git a/doc/man3/CMS_sign.pod b/doc/man3/CMS_sign.pod index 6de36abb2d0939c6a96ed8411e3fbda25605fdb5..884be8fdd315b6ff0a97c2543b5b3779c4b88606 100644 --- a/doc/man3/CMS_sign.pod +++ b/doc/man3/CMS_sign.pod @@ -119,7 +119,7 @@ it is supported for embedded data in OpenSSL 1.0.0 and later. =head1 COPYRIGHT -Copyright 2008-2016 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2008-2023 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index 6b2e1441b71e79344562bf49f7baaebd677fef97..d2c0aaf27700fac1d42aca7af1013e710e3d4ed0 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -39,8 +39,8 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x10101170L -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1w-dev xx XXX xxxx" +# define OPENSSL_VERSION_NUMBER 0x10101180L +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1x-dev xx XXX xxxx" /*- * The macros below are to be used for shared library (.so, .dll, ...) diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 2a5d21be79f6ec14f8e7f244360a4c355c6bc75c..68d1737ac521546146b09577df82c4087250ad0f 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -1,5 +1,5 @@ /* - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved. * Copyright 2005 Nokia. All rights reserved. * * Licensed under the OpenSSL license (the "License"). You may not use diff --git a/test/recipes/15-test_rsapss.t b/test/recipes/15-test_rsapss.t index 61c13b6a49a58bceb9fde72e01a728650e547239..cea72ce980db0ab02ecdb5bae707299941b05bd3 100644 --- a/test/recipes/15-test_rsapss.t +++ b/test/recipes/15-test_rsapss.t @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright 2017-2019 The OpenSSL Project Authors. All Rights Reserved. +# Copyright 2017-2023 The OpenSSL Project Authors. All Rights Reserved. # # Licensed under the OpenSSL license (the "License"). You may not use # this file except in compliance with the License. You can obtain a copy