diff --git a/ChangeLog b/ChangeLog index d0923e4d..2013e70a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ -* Version 1.0.21-stable - - Emscripten: a native ESM module (`libsodium.esm.mjs`) is now -built alongside the regular JavaScript bundle. +* Version 1.0.22 + This point release includes all the changes from 1.0.21-stable. + - Performance: NEON optimizations for Argon2 on ARM platforms. - Performance: SHA3 (Keccak1600) now leverages ARM SHA3 instructions when available on ARM platforms. - Performance: WebAssembly SIMD implementations of Argon2 have been added. diff --git a/appveyor.yml b/appveyor.yml index 9827d281..fe036e83 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.21.{build} +version: 1.0.22.{build} os: Visual Studio 2022 diff --git a/builds/msvc/resource.rc b/builds/msvc/resource.rc index 44ef0305..ddd177c4 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.21.0" -#define LIBSODIUM_VERSION_BIN 1,0,21,0 +#define LIBSODIUM_VERSION_STRING "1.0.22.0" +#define LIBSODIUM_VERSION_BIN 1,0,22,0 //specify the product name for the dlls based on the platform we are compiling for #if defined(x64) diff --git a/builds/msvc/version.h b/builds/msvc/version.h index 6c31150b..59564316 100644 --- a/builds/msvc/version.h +++ b/builds/msvc/version.h @@ -4,10 +4,10 @@ #include "export.h" -#define SODIUM_VERSION_STRING "1.0.21" +#define SODIUM_VERSION_STRING "1.0.22" #define SODIUM_LIBRARY_VERSION_MAJOR 26 -#define SODIUM_LIBRARY_VERSION_MINOR 3 +#define SODIUM_LIBRARY_VERSION_MINOR 4 #ifdef __cplusplus diff --git a/ci/appveyor/msvc-scripts/process.bat b/ci/appveyor/msvc-scripts/process.bat index e4b7f0a5..0a79f904 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.21/ < ..\..\src\libsodium\include\sodium\version.h.in > tmp +cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.22/ < ..\..\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@/3/ < tmp2 > tmp3 +cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/4/ < 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 1360a170..34ed561c 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.73 for libsodium 1.0.21. +# Generated by GNU Autoconf 2.73 for libsodium 1.0.22. # # Report bugs to . # @@ -598,8 +598,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libsodium' PACKAGE_TARNAME='libsodium' -PACKAGE_VERSION='1.0.21' -PACKAGE_STRING='libsodium 1.0.21' +PACKAGE_VERSION='1.0.22' +PACKAGE_STRING='libsodium 1.0.22' PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues' PACKAGE_URL='https://libsodium.org' @@ -1427,7 +1427,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.21 to adapt to many kinds of systems. +'configure' configures libsodium 1.0.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1499,7 +1499,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libsodium 1.0.21:";; + short | recursive ) echo "Configuration of libsodium 1.0.22:";; esac cat <<\_ACEOF @@ -1651,7 +1651,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libsodium configure 1.0.21 +libsodium configure 1.0.22 generated by GNU Autoconf 2.73 Copyright (C) 2026 Free Software Foundation, Inc. @@ -2017,7 +2017,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.21, which was +It was created by libsodium $as_me 1.0.22, which was generated by GNU Autoconf 2.73. Invocation command line was $ $0$ac_configure_args_raw @@ -3752,7 +3752,7 @@ fi # Define the identity of the package. PACKAGE='libsodium' - VERSION='1.0.21' + VERSION='1.0.22' printf '%s\n' "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -3994,9 +3994,9 @@ fi SODIUM_LIBRARY_VERSION_MAJOR=26 -SODIUM_LIBRARY_VERSION_MINOR=3 +SODIUM_LIBRARY_VERSION_MINOR=4 DLL_VERSION=26 -SODIUM_LIBRARY_VERSION=29:0:3 +SODIUM_LIBRARY_VERSION=30:0:4 # | | | # +------+ | +---+ # | | | @@ -23616,7 +23616,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.21, which was +This file was extended by libsodium $as_me 1.0.22, which was generated by GNU Autoconf 2.73. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -23676,7 +23676,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.21 +libsodium config.status 1.0.22 configured by $0, generated by GNU Autoconf 2.73, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 0d6c8f8b..3baf9a96 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([libsodium],[1.0.21],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://libsodium.org]) +AC_INIT([libsodium],[1.0.22],[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=3 +SODIUM_LIBRARY_VERSION_MINOR=4 DLL_VERSION=26 -SODIUM_LIBRARY_VERSION=29:0:3 +SODIUM_LIBRARY_VERSION=30:0:4 # | | | # +------+ | +---+ # | | | diff --git a/dist-build/android-aar.sh b/dist-build/android-aar.sh index 720a17cd..2984ebea 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.21.0" +SODIUM_VERSION="1.0.22.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 6e671972..15015275 100644 --- a/packaging/dotnet-core/libsodium.pkgproj +++ b/packaging/dotnet-core/libsodium.pkgproj @@ -9,7 +9,7 @@ libsodium - 1.0.21.0 + 1.0.22.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 f0e5e3b3..bc7d4741 100644 --- a/packaging/nuget/package.config +++ b/packaging/nuget/package.config @@ -1,4 +1,4 @@ - +