Skip to content

Commit 9511c98

Browse files
jedisct1jedisct1
committed
1.0.20
1 parent b85bf57 commit 9511c98

26 files changed

+62
-25
lines changed

‎ChangeLog

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* Version 1.0.20
2+
This point release includes all the changes from 1.0.19-stable,
3+
mainly addressing compilation issues and improvements to the .NET
4+
packages.
5+
16
* Version 1.0.19-stable
27
- Building with `zig build` now requires Zig 0.12.
38
- When using the traditional build system, -O3 is used instead of -Ofast.

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 1.0.19.{build}
1+
version: 1.0.20.{build}
22

33
os: Visual Studio 2017
44

‎builds/msvc/resource.rc

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#include "windows.h"
55

66
//specify the version numbers for the dll's
7-
#define LIBSODIUM_VERSION_STRING "1.0.19.0"
8-
#define LIBSODIUM_VERSION_BIN 1,0,19,0
7+
#define LIBSODIUM_VERSION_STRING "1.0.20.0"
8+
#define LIBSODIUM_VERSION_BIN 1,0,20,0
99

1010
//specify the product name for the dlls based on the platform we are compiling for
1111
#if defined(x64)

‎builds/msvc/version.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
#include "export.h"
66

7-
#define SODIUM_VERSION_STRING "1.0.19"
7+
#define SODIUM_VERSION_STRING "1.0.20"
88

99
#define SODIUM_LIBRARY_VERSION_MAJOR 26
10-
#define SODIUM_LIBRARY_VERSION_MINOR 1
10+
#define SODIUM_LIBRARY_VERSION_MINOR 2
1111

1212

1313
#ifdef __cplusplus

‎builds/msvc/vs2010/libsodium/libsodium.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aegis256.h" />
206206
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
207207
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
208+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
208209
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
209210
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
210211
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

‎builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,9 @@
431431
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
432432
<Filter>include\sodium</Filter>
433433
</ClInclude>
434+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
435+
<Filter>include\sodium</Filter>
436+
</ClInclude>
434437
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
435438
<Filter>include\sodium</Filter>
436439
</ClInclude>

‎builds/msvc/vs2012/libsodium/libsodium.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aegis256.h" />
206206
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
207207
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
208+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
208209
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
209210
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
210211
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

‎builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,9 @@
431431
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
432432
<Filter>include\sodium</Filter>
433433
</ClInclude>
434+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
435+
<Filter>include\sodium</Filter>
436+
</ClInclude>
434437
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
435438
<Filter>include\sodium</Filter>
436439
</ClInclude>

‎builds/msvc/vs2013/libsodium/libsodium.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aegis256.h" />
206206
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
207207
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
208+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
208209
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
209210
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
210211
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

‎builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,9 @@
431431
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
432432
<Filter>include\sodium</Filter>
433433
</ClInclude>
434+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
435+
<Filter>include\sodium</Filter>
436+
</ClInclude>
434437
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
435438
<Filter>include\sodium</Filter>
436439
</ClInclude>

‎builds/msvc/vs2015/libsodium/libsodium.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aegis256.h" />
206206
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
207207
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
208+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
208209
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
209210
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
210211
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

‎builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,9 @@
431431
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
432432
<Filter>include\sodium</Filter>
433433
</ClInclude>
434+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
435+
<Filter>include\sodium</Filter>
436+
</ClInclude>
434437
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
435438
<Filter>include\sodium</Filter>
436439
</ClInclude>

‎builds/msvc/vs2017/libsodium/libsodium.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aegis256.h" />
206206
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
207207
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
208+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
208209
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
209210
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
210211
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

‎builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,9 @@
431431
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
432432
<Filter>include\sodium</Filter>
433433
</ClInclude>
434+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
435+
<Filter>include\sodium</Filter>
436+
</ClInclude>
434437
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
435438
<Filter>include\sodium</Filter>
436439
</ClInclude>

‎builds/msvc/vs2019/libsodium/libsodium.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@
229229
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aegis256.h" />
230230
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
231231
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
232+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
232233
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
233234
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
234235
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

‎builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,9 @@
431431
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
432432
<Filter>include\sodium</Filter>
433433
</ClInclude>
434+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
435+
<Filter>include\sodium</Filter>
436+
</ClInclude>
434437
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
435438
<Filter>include\sodium</Filter>
436439
</ClInclude>

‎builds/msvc/vs2022/libsodium/libsodium.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@
229229
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_aead_aegis256.h" />
230230
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
231231
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
232+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
232233
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
233234
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
234235
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

‎builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,9 @@
431431
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h">
432432
<Filter>include\sodium</Filter>
433433
</ClInclude>
434+
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h">
435+
<Filter>include\sodium</Filter>
436+
</ClInclude>
434437
<ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h">
435438
<Filter>include\sodium</Filter>
436439
</ClInclude>

‎ci/appveyor/libsodium.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@
453453
<ClInclude Include="..\..\src\libsodium\include\sodium\crypto_aead_aegis256.h" />
454454
<ClInclude Include="..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
455455
<ClInclude Include="..\..\src\libsodium\include\sodium\core.h" />
456+
<ClInclude Include="..\..\src\libsodium\include\sodium\version.h" />
456457
<ClInclude Include="..\..\src\libsodium\include\sodium\export.h" />
457458
<ClInclude Include="..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
458459
<ClInclude Include="..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />

‎ci/appveyor/libsodium.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,9 @@
422422
<ClInclude Include="..\..\src\libsodium\include\sodium\core.h">
423423
<Filter>Header Files</Filter>
424424
</ClInclude>
425+
<ClInclude Include="..\..\src\libsodium\include\sodium\version.h">
426+
<Filter>Header Files</Filter>
427+
</ClInclude>
425428
<ClInclude Include="..\..\src\libsodium\include\sodium\export.h">
426429
<Filter>Header Files</Filter>
427430
</ClInclude>

‎ci/appveyor/msvc-scripts/process.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.20/ < ..\..\src\libsodium\include\sodium\version.h.in > tmp
2-
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/28/ < tmp > tmp2
3-
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/0/ < tmp2 > tmp3
2+
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/26/ < tmp > tmp2
3+
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/2/ < tmp2 > tmp3
44
cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > ..\..\src\libsodium\include\sodium\version.h
55
del tmp tmp2 tmp3

‎configure

+12-12
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.72 for libsodium 1.0.19.
3+
# Generated by GNU Autoconf 2.72 for libsodium 1.0.20.
44
#
55
# Report bugs to <https://github.com/jedisct1/libsodium/issues>.
66
#
@@ -614,8 +614,8 @@ MAKEFLAGS=
614614
# Identity of this package.
615615
PACKAGE_NAME='libsodium'
616616
PACKAGE_TARNAME='libsodium'
617-
PACKAGE_VERSION='1.0.19'
618-
PACKAGE_STRING='libsodium 1.0.19'
617+
PACKAGE_VERSION='1.0.20'
618+
PACKAGE_STRING='libsodium 1.0.20'
619619
PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
620620
PACKAGE_URL='https://libsodium.org'
621621

@@ -1439,7 +1439,7 @@ if test "$ac_init_help" = "long"; then
14391439
# Omit some internal or obsolete options to make the list less imposing.
14401440
# This message is too long to be a string in the A/UX 3.1 sh.
14411441
cat <<_ACEOF
1442-
'configure' configures libsodium 1.0.19 to adapt to many kinds of systems.
1442+
'configure' configures libsodium 1.0.20 to adapt to many kinds of systems.
14431443

14441444
Usage: $0 [OPTION]... [VAR=VALUE]...
14451445

@@ -1511,7 +1511,7 @@ fi
15111511

15121512
if test -n "$ac_init_help"; then
15131513
case $ac_init_help in
1514-
short | recursive ) echo "Configuration of libsodium 1.0.19:";;
1514+
short | recursive ) echo "Configuration of libsodium 1.0.20:";;
15151515
esac
15161516
cat <<\_ACEOF
15171517

@@ -1663,7 +1663,7 @@ fi
16631663
test -n "$ac_init_help" && exit $ac_status
16641664
if $ac_init_version; then
16651665
cat <<\_ACEOF
1666-
libsodium configure 1.0.19
1666+
libsodium configure 1.0.20
16671667
generated by GNU Autoconf 2.72
16681668

16691669
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2029,7 +2029,7 @@ cat >config.log <<_ACEOF
20292029
This file contains any messages produced by compilers while
20302030
running configure, to aid debugging if configure makes a mistake.
20312031

2032-
It was created by libsodium $as_me 1.0.19, which was
2032+
It was created by libsodium $as_me 1.0.20, which was
20332033
generated by GNU Autoconf 2.72. Invocation command line was
20342034

20352035
$ $0$ac_configure_args_raw
@@ -3444,7 +3444,7 @@ fi
34443444

34453445
# Define the identity of the package.
34463446
PACKAGE='libsodium'
3447-
VERSION='1.0.19'
3447+
VERSION='1.0.20'
34483448

34493449

34503450
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -3756,9 +3756,9 @@ fi
37563756

37573757

37583758
SODIUM_LIBRARY_VERSION_MAJOR=26
3759-
SODIUM_LIBRARY_VERSION_MINOR=1
3759+
SODIUM_LIBRARY_VERSION_MINOR=2
37603760
DLL_VERSION=26
3761-
SODIUM_LIBRARY_VERSION=27:0:1
3761+
SODIUM_LIBRARY_VERSION=28:0:2
37623762
# | | |
37633763
# +------+ | +---+
37643764
# | | |
@@ -22664,7 +22664,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2266422664
# report actual input values of CONFIG_FILES etc. instead of their
2266522665
# values after options handling.
2266622666
ac_log="
22667-
This file was extended by libsodium $as_me 1.0.19, which was
22667+
This file was extended by libsodium $as_me 1.0.20, which was
2266822668
generated by GNU Autoconf 2.72. Invocation command line was
2266922669

2267022670
CONFIG_FILES = $CONFIG_FILES
@@ -22724,7 +22724,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
2272422724
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2272522725
ac_cs_config='$ac_cs_config_escaped'
2272622726
ac_cs_version="\\
22727-
libsodium config.status 1.0.19
22727+
libsodium config.status 1.0.20
2272822728
configured by $0, generated by GNU Autoconf 2.72,
2272922729
with options \\"\$ac_cs_config\\"
2273022730

‎configure.ac

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
AC_PREREQ([2.69])
2-
AC_INIT([libsodium],[1.0.19],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://libsodium.org])
2+
AC_INIT([libsodium],[1.0.20],[https://github.com/jedisct1/libsodium/issues],[libsodium],[https://libsodium.org])
33
AC_CONFIG_AUX_DIR([build-aux])
44
AC_CONFIG_MACRO_DIR([m4])
55
AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c])
@@ -13,9 +13,9 @@ AM_DEP_TRACK
1313
AC_SUBST(VERSION)
1414

1515
SODIUM_LIBRARY_VERSION_MAJOR=26
16-
SODIUM_LIBRARY_VERSION_MINOR=1
16+
SODIUM_LIBRARY_VERSION_MINOR=2
1717
DLL_VERSION=26
18-
SODIUM_LIBRARY_VERSION=27:0:1
18+
SODIUM_LIBRARY_VERSION=28:0:2
1919
# | | |
2020
# +------+ | +---+
2121
# | | |

‎dist-build/android-aar.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# The x86 static library will not work due to text relocation rules, so static x86 versions are limited to shared libraries.
66
# To simplify linking, library variants have distinct names: sodium, sodium-static, sodium-minimal and sodium-minimal-static.
77

8-
SODIUM_VERSION="1.0.19.0"
8+
SODIUM_VERSION="1.0.20.0"
99
NDK_VERSION=$(grep "Pkg.Revision = " <"${ANDROID_NDK_HOME}/source.properties" | cut -f 2 -d '=' | cut -f 2 -d' ' | cut -f 1 -d'.')
1010
DEST_PATH=$(mktemp -d)
1111

‎packaging/dotnet-core/libsodium.pkgproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<PropertyGroup>
1111
<PackageId>libsodium</PackageId>
12-
<Version>1.0.19.2</Version>
12+
<Version>1.0.20.0</Version>
1313
<Authors>Frank Denis</Authors>
1414
<Description>Internal implementation package not meant for direct consumption. Please do not reference directly.</Description>
1515
<Copyright>&#169; $([System.DateTime]::UtcNow.ToString(yyyy)) Frank Denis</Copyright>

‎packaging/nuget/package.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- These values are populated into the package.gsl templates by package.bat. -->
33
<!-- The target attribute controls path and file name only, id controls package naming. -->
4-
<package id="libsodium_vc120" target="libsodium" version = "1.0.19.0" pathversion="1_0_19_0" platformtoolset="v120" />
4+
<package id="libsodium_vc120" target="libsodium" version = "1.0.20.0" pathversion="1_0_20_0" platformtoolset="v120" />

0 commit comments

Comments
 (0)