diff --git a/builds/msvc/resource.rc b/builds/msvc/resource.rc index db9c5226..feb27d5a 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.17.0" -#define LIBSODIUM_VERSION_BIN 1,0,17,0 +#define LIBSODIUM_VERSION_STRING "1.0.18.0" +#define LIBSODIUM_VERSION_BIN 1,0,18,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 031d298f..174d9921 100644 --- a/builds/msvc/version.h +++ b/builds/msvc/version.h @@ -4,10 +4,10 @@ #include "export.h" -#define SODIUM_VERSION_STRING "1.0.17" +#define SODIUM_VERSION_STRING "1.0.18" #define SODIUM_LIBRARY_VERSION_MAJOR 10 -#define SODIUM_LIBRARY_VERSION_MINOR 2 +#define SODIUM_LIBRARY_VERSION_MINOR 3 #ifdef __cplusplus extern "C" { diff --git a/configure.ac b/configure.ac index e1fceada..88259b75 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.65]) -AC_INIT([libsodium],[1.0.17], +AC_INIT([libsodium],[1.0.18], [https://github.com/jedisct1/libsodium/issues], [libsodium], [https://github.com/jedisct1/libsodium]) @@ -15,9 +15,9 @@ AM_DEP_TRACK AC_SUBST(VERSION) SODIUM_LIBRARY_VERSION_MAJOR=10 -SODIUM_LIBRARY_VERSION_MINOR=2 -DLL_VERSION=23 -SODIUM_LIBRARY_VERSION=25:0:2 +SODIUM_LIBRARY_VERSION_MINOR=3 +DLL_VERSION=24 +SODIUM_LIBRARY_VERSION=26:0:3 # | | | # +------+ | +---+ # | | | diff --git a/msvc-scripts/process.bat b/msvc-scripts/process.bat index fdaeaecf..291679e4 100755 --- a/msvc-scripts/process.bat +++ b/msvc-scripts/process.bat @@ -1,5 +1,5 @@ -cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.17/ < src\libsodium\include\sodium\version.h.in > tmp +cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.18/ < src\libsodium\include\sodium\version.h.in > tmp cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/10/ < 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/packaging/dotnet-core/README.md b/packaging/dotnet-core/README.md index 462ec29f..a9016b6b 100644 --- a/packaging/dotnet-core/README.md +++ b/packaging/dotnet-core/README.md @@ -31,15 +31,15 @@ Version numbers for the packages for .NET Core consist of three components: It may be necessary to release more than one package for a libsodium version, e.g., when adding support for a new platform or if a release contains a broken binary. In this case, a package revision number is added as a fourth part to - the libsodium version, starting at `1`. For example, `1.0.17` is the initial - release of the package for libsodium 1.0.17 and `1.0.17.5` is the fifth + the libsodium version, starting at `1`. For example, `1.0.18` is the initial + release of the package for libsodium 1.0.18 and `1.0.18.5` is the fifth revision (sixth release) of that package. * *pre-release label* If a package is a pre-release, a label is appended to the version number in `-preview-##` format where `##` is the number of the pre-release, starting at - `01`. For example, `1.0.17-preview-01` is the first pre-release of the package - for libsodium 1.0.17 and `1.0.17.5-preview-02` the second pre-release of the - fifth revision of the package for libsodium 1.0.17. + `01`. For example, `1.0.18-preview-01` is the first pre-release of the package + for libsodium 1.0.18 and `1.0.18.5-preview-02` the second pre-release of the + fifth revision of the package for libsodium 1.0.18. **Making a release** diff --git a/packaging/dotnet-core/prepare.py b/packaging/dotnet-core/prepare.py index b1abde14..7a4883f5 100755 --- a/packaging/dotnet-core/prepare.py +++ b/packaging/dotnet-core/prepare.py @@ -203,13 +203,13 @@ def main(args): print(" python3 prepare.py ") print() print("Examples:") - print(" python3 prepare.py 1.0.17-preview-01") - print(" python3 prepare.py 1.0.17-preview-02") - print(" python3 prepare.py 1.0.17-preview-03") - print(" python3 prepare.py 1.0.17") - print(" python3 prepare.py 1.0.17.1-preview-01") - print(" python3 prepare.py 1.0.17.1") - print(" python3 prepare.py 1.0.17.2") + print(" python3 prepare.py 1.0.18-preview-01") + print(" python3 prepare.py 1.0.18-preview-02") + print(" python3 prepare.py 1.0.18-preview-03") + print(" python3 prepare.py 1.0.18") + print(" python3 prepare.py 1.0.18.1-preview-01") + print(" python3 prepare.py 1.0.18.1") + print(" python3 prepare.py 1.0.18.2") return 1 version = Version(m.group(2), m.group(0)) diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config index 3e678873..33eda2dd 100644 --- a/packaging/nuget/package.config +++ b/packaging/nuget/package.config @@ -1,4 +1,4 @@ - + diff --git a/src/libsodium/include/sodium/private/common.h b/src/libsodium/include/sodium/private/common.h index dd95f0fa..339e725b 100644 --- a/src/libsodium/include/sodium/private/common.h +++ b/src/libsodium/include/sodium/private/common.h @@ -1,7 +1,7 @@ #ifndef common_H #define common_H 1 -#if !defined(_MSC_VER) && !defined(DEV_MODE) && 1 +#if !defined(_MSC_VER) && !defined(DEV_MODE) && 0 # warning *** This is unstable, untested, development code. # warning It might not compile. It might not work as expected. # warning It might be totally insecure.