From f3ce049a9865e52816859ef8352a8b928d61bef0 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sun, 30 Dec 2018 12:04:52 +0100
Subject: [PATCH] Bump to 1.0.17

Not released yet. This is just to encourage people to test the current
code.
---
 ChangeLog                                     | 1 +
 builds/msvc/resource.rc                       | 6 +++---
 builds/msvc/version.h                         | 4 ++--
 configure.ac                                  | 4 ++--
 msvc-scripts/process.bat                      | 4 ++--
 src/libsodium/include/sodium/private/common.h | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e76e255..d50df121 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@ especially useful for blinding.
  - `sodium_sub()` has been implemented.
  - Support for WatchOS has been added.
  - getrandom(2) is now used on FreeBSD 12+.
+ - The `nonnull` attribute has been added to all relevant prototypes.
 
 * Version 1.0.16
  - Signatures computations and verifications are now way faster on
diff --git a/builds/msvc/resource.rc b/builds/msvc/resource.rc
index cb30e7b1..db9c5226 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.16.0"
-#define LIBSODIUM_VERSION_BIN 1,0,16,0
+#define LIBSODIUM_VERSION_STRING "1.0.17.0"
+#define LIBSODIUM_VERSION_BIN 1,0,17,0
 
 //specify the product name for the dlls based on the platform we are compiling for
 #if defined(x64)
@@ -47,7 +47,7 @@ BEGIN
             VALUE "FileDescription", "The Sodium crypto library (libsodium) "
             VALUE "FileVersion", LIBSODIUM_VERSION_STRING
             VALUE "InternalName", "libsodium"
-            VALUE "LegalCopyright", "Copyright (c) 2017 The libsodium authors."
+            VALUE "LegalCopyright", "Copyright (c) 2013-2019 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 56ec2b95..031d298f 100644
--- a/builds/msvc/version.h
+++ b/builds/msvc/version.h
@@ -4,10 +4,10 @@
 
 #include "export.h"
 
-#define SODIUM_VERSION_STRING "1.0.16"
+#define SODIUM_VERSION_STRING "1.0.17"
 
 #define SODIUM_LIBRARY_VERSION_MAJOR 10
-#define SODIUM_LIBRARY_VERSION_MINOR 1
+#define SODIUM_LIBRARY_VERSION_MINOR 2
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/configure.ac b/configure.ac
index 4c4e6d49..93d2b5f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.65])
-AC_INIT([libsodium],[1.0.16],
+AC_INIT([libsodium],[1.0.17],
   [https://github.com/jedisct1/libsodium/issues],
   [libsodium],
   [https://github.com/jedisct1/libsodium])
@@ -17,7 +17,7 @@ AC_SUBST(VERSION)
 SODIUM_LIBRARY_VERSION_MAJOR=10
 SODIUM_LIBRARY_VERSION_MINOR=1
 DLL_VERSION=8
-SODIUM_LIBRARY_VERSION=24:0:1
+SODIUM_LIBRARY_VERSION=25:0:2
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
diff --git a/msvc-scripts/process.bat b/msvc-scripts/process.bat
index 84c44786..fdaeaecf 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.16/ < src\libsodium\include\sodium\version.h.in > tmp
+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/@SODIUM_LIBRARY_VERSION_MAJOR@/10/ < tmp > tmp2
-cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/1/ < tmp2 > tmp3
+cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/2/ < 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/src/libsodium/include/sodium/private/common.h b/src/libsodium/include/sodium/private/common.h
index f87d682e..9a2f7fab 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) && 1
+#if !defined(_MSC_VER) && 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.