From ae7ca7ef13ed481cc631dc84eaaa0c9e48a41f72 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Fri, 2 Jan 2026 23:00:02 +0100 Subject: [PATCH] Bump --- ChangeLog | 16 ++++++++++++++++ appveyor.yml | 2 +- builds/msvc/resource.rc | 6 +++--- builds/msvc/version.h | 4 ++-- ci/appveyor/msvc-scripts/process.bat | 4 ++-- configure | 24 ++++++++++++------------ configure.ac | 6 +++--- dist-build/android-aar.sh | 2 +- packaging/dotnet-core/libsodium.pkgproj | 2 +- packaging/nuget/package.config | 2 +- 10 files changed, 42 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 957c3823..98e4632c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +* Version 1.0.21 + This point release includes all the changes from 1.0.20-stable, which +includes a security fix for the `crypto_core_ed25519_is_valid_point()` +function, as well as two new sets of functions: + - The new `crypto_ipcrypt_*` functions implement mechanisms for securely +encrypting and anonymizing IP addresses as specified in https://ipcrypt-std.github.io + - The `sodium_bin2ip` and `sodium_ip2bin` helper functions have been added +to complement the `crypto_ipcrypt_*` functions and easily convert addresses +between bytes and strings. + - XOF: the `crypto_xof_shake*` and `crypto_xof_turboshake*` functions +are standard extendable output functions. From input of any length, they can +derive output of any length with the same properties as hash functions. These +primitives are required by many post-quantum mechanisms, but can also be used +for a wide range of applications, including key derivation, session encryption +and more. + * Version 1.0.20-stable - XCFramework: cross-compilation is now forced on Apple Silicon to avoid Rosetta-related build issues diff --git a/appveyor.yml b/appveyor.yml index 3c392e12..9827d281 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.20.{build} +version: 1.0.21.{build} os: Visual Studio 2022 diff --git a/builds/msvc/resource.rc b/builds/msvc/resource.rc index 3697e3ac..44ef0305 100644 --- a/builds/msvc/resource.rc +++ b/builds/msvc/resource.rc @@ -4,8 +4,8 @@ #include "windows.h" //specify the version numbers for the dll's -#define LIBSODIUM_VERSION_STRING "1.0.20.0" -#define LIBSODIUM_VERSION_BIN 1,0,20,0 +#define LIBSODIUM_VERSION_STRING "1.0.21.0" +#define LIBSODIUM_VERSION_BIN 1,0,21,0 //specify the product name for the dlls based on the platform we are compiling for #if defined(x64) @@ -49,7 +49,7 @@ BEGIN VALUE "FileDescription", "The Sodium crypto library (libsodium)" VALUE "FileVersion", LIBSODIUM_VERSION_STRING VALUE "InternalName", "libsodium" - VALUE "LegalCopyright", "Copyright (c) 2013-2024 The libsodium authors." + VALUE "LegalCopyright", "Copyright (c) 2013-2026 The libsodium authors." VALUE "OriginalFilename", "libsodium.dll" VALUE "ProductName", LIBSODIUM_PRODUCT_NAME VALUE "ProductVersion", LIBSODIUM_VERSION_STRING diff --git a/builds/msvc/version.h b/builds/msvc/version.h index e07ae90d..6c31150b 100644 --- a/builds/msvc/version.h +++ b/builds/msvc/version.h @@ -4,10 +4,10 @@ #include "export.h" -#define SODIUM_VERSION_STRING "1.0.20" +#define SODIUM_VERSION_STRING "1.0.21" #define SODIUM_LIBRARY_VERSION_MAJOR 26 -#define SODIUM_LIBRARY_VERSION_MINOR 2 +#define SODIUM_LIBRARY_VERSION_MINOR 3 #ifdef __cplusplus diff --git a/ci/appveyor/msvc-scripts/process.bat b/ci/appveyor/msvc-scripts/process.bat index b09efd82..e4b7f0a5 100755 --- a/ci/appveyor/msvc-scripts/process.bat +++ b/ci/appveyor/msvc-scripts/process.bat @@ -1,5 +1,5 @@ -cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.20/ < ..\..\src\libsodium\include\sodium\version.h.in > tmp +cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.21/ < ..\..\src\libsodium\include\sodium\version.h.in > tmp cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/26/ < tmp > tmp2 -cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/2/ < tmp2 > tmp3 +cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/3/ < tmp2 > tmp3 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > ..\..\src\libsodium\include\sodium\version.h del tmp tmp2 tmp3 diff --git a/configure b/configure index 9107c295..e4e8af5a 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.72 for libsodium 1.0.20. +# Generated by GNU Autoconf 2.72 for libsodium 1.0.21. # # Report bugs to . # @@ -614,8 +614,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libsodium' PACKAGE_TARNAME='libsodium' -PACKAGE_VERSION='1.0.20' -PACKAGE_STRING='libsodium 1.0.20' +PACKAGE_VERSION='1.0.21' +PACKAGE_STRING='libsodium 1.0.21' PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues' PACKAGE_URL='https://libsodium.org' @@ -1443,7 +1443,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -'configure' configures libsodium 1.0.20 to adapt to many kinds of systems. +'configure' configures libsodium 1.0.21 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1515,7 +1515,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libsodium 1.0.20:";; + short | recursive ) echo "Configuration of libsodium 1.0.21:";; esac cat <<\_ACEOF @@ -1667,7 +1667,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libsodium configure 1.0.20 +libsodium configure 1.0.21 generated by GNU Autoconf 2.72 Copyright (C) 2023 Free Software Foundation, Inc. @@ -2033,7 +2033,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libsodium $as_me 1.0.20, which was +It was created by libsodium $as_me 1.0.21, which was generated by GNU Autoconf 2.72. Invocation command line was $ $0$ac_configure_args_raw @@ -3633,7 +3633,7 @@ fi # Define the identity of the package. PACKAGE='libsodium' - VERSION='1.0.20' + VERSION='1.0.21' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3875,9 +3875,9 @@ fi SODIUM_LIBRARY_VERSION_MAJOR=26 -SODIUM_LIBRARY_VERSION_MINOR=2 +SODIUM_LIBRARY_VERSION_MINOR=3 DLL_VERSION=26 -SODIUM_LIBRARY_VERSION=28:0:2 +SODIUM_LIBRARY_VERSION=29:0:3 # | | | # +------+ | +---+ # | | | @@ -23494,7 +23494,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libsodium $as_me 1.0.20, which was +This file was extended by libsodium $as_me 1.0.21, which was generated by GNU Autoconf 2.72. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23554,7 +23554,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libsodium config.status 1.0.20 +libsodium config.status 1.0.21 configured by $0, generated by GNU Autoconf 2.72, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9f9d9737..9c7961df 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([libsodium],[1.0.20],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://libsodium.org]) +AC_INIT([libsodium],[1.0.21],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://libsodium.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c]) @@ -13,9 +13,9 @@ AM_DEP_TRACK AC_SUBST(VERSION) SODIUM_LIBRARY_VERSION_MAJOR=26 -SODIUM_LIBRARY_VERSION_MINOR=2 +SODIUM_LIBRARY_VERSION_MINOR=3 DLL_VERSION=26 -SODIUM_LIBRARY_VERSION=28:0:2 +SODIUM_LIBRARY_VERSION=29:0:3 # | | | # +------+ | +---+ # | | | diff --git a/dist-build/android-aar.sh b/dist-build/android-aar.sh index a7c8c763..720a17cd 100755 --- a/dist-build/android-aar.sh +++ b/dist-build/android-aar.sh @@ -4,7 +4,7 @@ # # To simplify linking, library variants have distinct names: sodium, sodium-static, sodium-minimal and sodium-minimal-static. -SODIUM_VERSION="1.0.20.2" +SODIUM_VERSION="1.0.21.0" if [ -z "$ANDROID_NDK_HOME" ]; then echo "ANDROID_NDK_HOME must be set to the directory containing the Android NDK." diff --git a/packaging/dotnet-core/libsodium.pkgproj b/packaging/dotnet-core/libsodium.pkgproj index 8d541ff0..6e671972 100644 --- a/packaging/dotnet-core/libsodium.pkgproj +++ b/packaging/dotnet-core/libsodium.pkgproj @@ -9,7 +9,7 @@ libsodium - 1.0.20.2 + 1.0.21.0 Frank Denis Internal implementation package not meant for direct consumption. Please do not reference directly. © $([System.DateTime]::UtcNow.ToString(yyyy)) Frank Denis diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config index 29292c1c..f0e5e3b3 100644 --- a/packaging/nuget/package.config +++ b/packaging/nuget/package.config @@ -1,4 +1,4 @@ - +