project: Update for 1.8.5 merge.

Author: Sibras

SMP/SMP.patch

@@ -92,7 +92,7 @@ index 7b6e330d..3ca6d801 100644
 
    _gcry_md_block_write (context, NULL, 0); /* flush */ ;
 diff --git a/mpi/ec.c b/mpi/ec.c
-index 89077cd9..9beeba21 100644
+index adb02600..faba8452 100644
 --- a/mpi/ec.c
 +++ b/mpi/ec.c
 @@ -30,6 +30,12 @@
@@ -525,6 +525,19 @@ index af3fe2c6..096ee3bc 100644
 
  #include "g10lib.h"
  #include "cipher-proto.h"
+diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
+index 75c49a0d..98fd2035 100644
+--- a/src/gcrypt.h.in
++++ b/src/gcrypt.h.in
+@@ -36,7 +36,7 @@
+ # include <ws2tcpip.h>
+ # include <time.h>
+ # ifndef __GNUC__
+-  typedef long ssize_t;
++  typedef SSIZE_T ssize_t;
+   typedef int  pid_t;
+ # endif /*!__GNUC__*/
+ #else
 diff --git a/src/global.c b/src/global.c
 index cd3d9d90..d445348a 100644
 --- a/src/global.c

SMP/gcrypt.h

@@ -36,7 +36,7 @@
 # include <ws2tcpip.h>
 # include <time.h>
 # ifndef __GNUC__
-  typedef SSIZE_T ssize_t;
+  typedef long ssize_t;
   typedef int  pid_t;
 # endif /*!__GNUC__*/
 #else
@@ -62,11 +62,11 @@ extern "C" {
    return the same version.  The purpose of this macro is to let
    autoconf (using the AM_PATH_GCRYPT macro) check that this header
    matches the installed library.  */
-#define GCRYPT_VERSION "1.8.4"
+#define GCRYPT_VERSION "1.8.5"
 
 /* The version number of this header.  It may be used to handle minor
    API incompatibilities.  */
-#define GCRYPT_VERSION_NUMBER 0x010804
+#define GCRYPT_VERSION_NUMBER 0x010805
 
 
 /* Internal: We can't use the convenience macros for the multi

SMP/version.h

@@ -1,11 +1,11 @@
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.8.4"
+#define PACKAGE_VERSION "1.8.5"
 
 /* Version of this package */
-#define VERSION "1.8.4"
+#define VERSION "1.8.5"
 
 /* GIT commit id revision used to build this package */
-#define BUILD_REVISION "9377517"
+#define BUILD_REVISION "5660633"
 
 /* The time this package was configured for a build */
-#define BUILD_TIMESTAMP "2018-11-10T10:56+0000"
+#define BUILD_TIMESTAMP "2019-09-07T14:09+0000"

SMP/versioninfo.rc

@@ -18,8 +18,8 @@
 
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,8,4,37751
- PRODUCTVERSION 1,8,4,37751
+ FILEVERSION 1,8,5,22112
+ PRODUCTVERSION 1,8,5,22112
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x21L
@@ -37,15 +37,15 @@ BEGIN
             VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+).\0"
             VALUE "CompanyName", "g10 Code GmbH\0"
             VALUE "FileDescription", "Libgcrypt - The GNU Crypto Library\0"
-            VALUE "FileVersion", "22.2.4.9377517\0"
+            VALUE "FileVersion", "22.2.5.5660633\0"
             VALUE "InternalName", "libgcrypt\0"
-            VALUE "LegalCopyright", "Copyright � 2018 Free Software Foundation, Inc.\0"
+            VALUE "LegalCopyright", "Copyright � 2019 Free Software Foundation, Inc.\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libgcrypt.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "libgcrypt\0"
-            VALUE "ProductVersion", "1.8.4\0"
-            VALUE "SpecialBuild", "2018-11-10T10:56+0000\0"
+            VALUE "ProductVersion", "1.8.5\0"
+            VALUE "SpecialBuild", "2019-09-07T14:09+0000\0"
         END
     END
 END