Skip to content
This repository was archived by the owner on Jan 26, 2026. It is now read-only.

Commit e1214d0

Browse files
SibrasSibras
committed
project: Update for 1.8.4 merge.
1 parent 5bd0355 commit e1214d0

4 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎SMP/gcrypt.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ extern "C" {
6262
return the same version. The purpose of this macro is to let
6363
autoconf (using the AM_PATH_GCRYPT macro) check that this header
6464
matches the installed library. */
65-
#define GCRYPT_VERSION "1.8.3"
65+
#define GCRYPT_VERSION "1.8.4"
6666

6767
/* The version number of this header. It may be used to handle minor
6868
API incompatibilities. */
69-
#define GCRYPT_VERSION_NUMBER 0x010803
69+
#define GCRYPT_VERSION_NUMBER 0x010804
7070

7171

7272
/* Internal: We can't use the convenience macros for the multi
@@ -1311,7 +1311,7 @@ gpg_error_t gcry_md_extract (gcry_md_hd_t hd, int algo, void *buffer,
13111311
size_t length);
13121312

13131313
/* Convenience function to calculate the hash from the data in BUFFER
1314-
of size LENGTH using the algorithm ALGO avoiding the creating of a
1314+
of size LENGTH using the algorithm ALGO avoiding the creation of a
13151315
hash object. The hash is returned in the caller provided buffer
13161316
DIGEST which must be large enough to hold the digest of the given
13171317
algorithm. */

‎SMP/libgcrypt.vcxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@
759759
<SubSystem>Windows</SubSystem>
760760
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
761761
<AdditionalDependencies>libgpg-errord.lib;%(AdditionalDependencies)</AdditionalDependencies>
762-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
762+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
763763
</Lib>
764764
<PostBuildEvent>
765765
<Command>mkdir "$(OutDir)"\include
@@ -827,7 +827,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
827827
<SubSystem>Windows</SubSystem>
828828
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
829829
<AdditionalDependencies>libgpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
830-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
830+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
831831
</Lib>
832832
<PostBuildEvent>
833833
<Command>mkdir "$(OutDir)"\include
@@ -892,7 +892,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
892892
<SubSystem>Windows</SubSystem>
893893
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
894894
<AdditionalDependencies>libgpg-errord.lib;%(AdditionalDependencies)</AdditionalDependencies>
895-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
895+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
896896
</Lib>
897897
<PostBuildEvent>
898898
<Command>mkdir "$(OutDir)"\include
@@ -960,7 +960,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
960960
<SubSystem>Windows</SubSystem>
961961
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
962962
<AdditionalDependencies>libgpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
963-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
963+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
964964
</Lib>
965965
<PostBuildEvent>
966966
<Command>mkdir "$(OutDir)"\include
@@ -1032,7 +1032,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
10321032
<GenerateDebugInformation>true</GenerateDebugInformation>
10331033
<MinimumRequiredVersion>5.1</MinimumRequiredVersion>
10341034
<AdditionalDependencies>gpg-errord.lib;%(AdditionalDependencies)</AdditionalDependencies>
1035-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1035+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
10361036
</Link>
10371037
<PostBuildEvent>
10381038
<Command>mkdir "$(OutDir)"\include
@@ -1109,7 +1109,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
11091109
<MinimumRequiredVersion Condition="'$(ApplicationTypeRevision)' == '8.1'">8.1</MinimumRequiredVersion>
11101110
<AdditionalDependencies>gpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
11111111
<WindowsMetadataFile>$(OutDir)\lib\x86\$(RootNamespace).winmd</WindowsMetadataFile>
1112-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1112+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
11131113
</Link>
11141114
<PostBuildEvent>
11151115
<Command>mkdir "$(OutDir)"\include
@@ -1179,7 +1179,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
11791179
<GenerateDebugInformation>true</GenerateDebugInformation>
11801180
<MinimumRequiredVersion>6.1</MinimumRequiredVersion>
11811181
<AdditionalDependencies>gpg-errord.lib;%(AdditionalDependencies)</AdditionalDependencies>
1182-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1182+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
11831183
</Link>
11841184
<PostBuildEvent>
11851185
<Command>mkdir "$(OutDir)"\include
@@ -1254,7 +1254,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
12541254
<MinimumRequiredVersion Condition="'$(ApplicationTypeRevision)' == '8.1'">8.1</MinimumRequiredVersion>
12551255
<AdditionalDependencies>gpg-errord_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
12561256
<WindowsMetadataFile>$(OutDir)\lib\x64\$(RootNamespace).winmd</WindowsMetadataFile>
1257-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1257+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
12581258
</Link>
12591259
<PostBuildEvent>
12601260
<Command>mkdir "$(OutDir)"\include
@@ -1326,7 +1326,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
13261326
<SubSystem>Windows</SubSystem>
13271327
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
13281328
<AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
1329-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1329+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
13301330
</Lib>
13311331
<PostBuildEvent>
13321332
<Command>mkdir "$(OutDir)"\include
@@ -1401,7 +1401,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
14011401
<SubSystem>Windows</SubSystem>
14021402
<AdditionalLibraryDirectories>$(OutDir)\lib\x86\;$(ProjectDir)\..\..\prebuilt\lib\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
14031403
<AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
1404-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1404+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
14051405
</Lib>
14061406
<PostBuildEvent>
14071407
<Command>mkdir "$(OutDir)"\include
@@ -1473,7 +1473,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
14731473
<SubSystem>Windows</SubSystem>
14741474
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
14751475
<AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
1476-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1476+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
14771477
</Lib>
14781478
<PostBuildEvent>
14791479
<Command>mkdir "$(OutDir)"\include
@@ -1548,7 +1548,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
15481548
<SubSystem>Windows</SubSystem>
15491549
<AdditionalLibraryDirectories>$(OutDir)\lib\x64\;$(ProjectDir)\..\..\prebuilt\lib\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
15501550
<AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
1551-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1551+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
15521552
</Lib>
15531553
<PostBuildEvent>
15541554
<Command>mkdir "$(OutDir)"\include
@@ -1627,7 +1627,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
16271627
<GenerateDebugInformation>true</GenerateDebugInformation>
16281628
<MinimumRequiredVersion>5.1</MinimumRequiredVersion>
16291629
<AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
1630-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1630+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
16311631
</Link>
16321632
<PostBuildEvent>
16331633
<Command>mkdir "$(OutDir)"\include
@@ -1706,7 +1706,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
17061706
<GenerateDebugInformation>true</GenerateDebugInformation>
17071707
<MinimumRequiredVersion>5.1</MinimumRequiredVersion>
17081708
<AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
1709-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1709+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
17101710
</Link>
17111711
<PostBuildEvent>
17121712
<Command>mkdir "$(OutDir)"\include
@@ -1790,7 +1790,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
17901790
<MinimumRequiredVersion Condition="'$(ApplicationTypeRevision)' == '8.1'">8.1</MinimumRequiredVersion>
17911791
<AdditionalDependencies>gpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
17921792
<WindowsMetadataFile>$(OutDir)\lib\x86\$(RootNamespace).winmd</WindowsMetadataFile>
1793-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1793+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
17941794
</Link>
17951795
<PostBuildEvent>
17961796
<Command>mkdir "$(OutDir)"\include
@@ -1874,7 +1874,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
18741874
<MinimumRequiredVersion Condition="'$(ApplicationTypeRevision)' == '8.1'">8.1</MinimumRequiredVersion>
18751875
<AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
18761876
<WindowsMetadataFile>$(OutDir)\lib\x86\$(RootNamespace).winmd</WindowsMetadataFile>
1877-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1877+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
18781878
</Link>
18791879
<PostBuildEvent>
18801880
<Command>mkdir "$(OutDir)"\include
@@ -1952,7 +1952,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
19521952
<GenerateDebugInformation>true</GenerateDebugInformation>
19531953
<MinimumRequiredVersion>6.1</MinimumRequiredVersion>
19541954
<AdditionalDependencies>gpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
1955-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
1955+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
19561956
</Link>
19571957
<PostBuildEvent>
19581958
<Command>mkdir "$(OutDir)"\include
@@ -2030,7 +2030,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
20302030
<GenerateDebugInformation>true</GenerateDebugInformation>
20312031
<MinimumRequiredVersion>6.1</MinimumRequiredVersion>
20322032
<AdditionalDependencies>libgpg-error.lib;%(AdditionalDependencies)</AdditionalDependencies>
2033-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
2033+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
20342034
</Link>
20352035
<PostBuildEvent>
20362036
<Command>mkdir "$(OutDir)"\include
@@ -2113,7 +2113,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
21132113
<MinimumRequiredVersion Condition="'$(ApplicationTypeRevision)' == '8.1'">8.1</MinimumRequiredVersion>
21142114
<AdditionalDependencies>gpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
21152115
<WindowsMetadataFile>$(OutDir)\lib\x64\$(RootNamespace).winmd</WindowsMetadataFile>
2116-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
2116+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
21172117
</Link>
21182118
<PostBuildEvent>
21192119
<Command>mkdir "$(OutDir)"\include
@@ -2196,7 +2196,7 @@ del /f /q $(OutDir)\licenses\libgcrypt.txt
21962196
<MinimumRequiredVersion Condition="'$(ApplicationTypeRevision)' == '8.1'">8.1</MinimumRequiredVersion>
21972197
<AdditionalDependencies>libgpg-error_winrt.lib;vccorlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
21982198
<WindowsMetadataFile>$(OutDir)\lib\x64\$(RootNamespace).winmd</WindowsMetadataFile>
2199-
<AdditionalOptions>/IGNORE:4006,4221 %(AdditionalOptions)</AdditionalOptions>
2199+
<AdditionalOptions>/IGNORE:4006,4221,4264 %(AdditionalOptions)</AdditionalOptions>
22002200
</Link>
22012201
<PostBuildEvent>
22022202
<Command>mkdir "$(OutDir)"\include

‎SMP/version.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* Define to the version of this package. */
2-
#define PACKAGE_VERSION "1.8.3"
2+
#define PACKAGE_VERSION "1.8.4"
33

44
/* Version of this package */
5-
#define VERSION "1.8.3"
5+
#define VERSION "1.8.4"
66

77
/* GIT commit id revision used to build this package */
8-
#define BUILD_REVISION "5600d2d"
8+
#define BUILD_REVISION "9377517"
99

1010
/* The time this package was configured for a build */
11-
#define BUILD_TIMESTAMP "2018-06-17T12:43+0000"
11+
#define BUILD_TIMESTAMP "2018-11-10T10:56+0000"

‎SMP/versioninfo.rc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919

2020
VS_VERSION_INFO VERSIONINFO
21-
FILEVERSION 1,8,3,22016
22-
PRODUCTVERSION 1,8,3,22016
21+
FILEVERSION 1,8,4,37751
22+
PRODUCTVERSION 1,8,4,37751
2323
FILEFLAGSMASK 0x3fL
2424
#ifdef _DEBUG
2525
FILEFLAGS 0x21L
@@ -37,15 +37,15 @@ BEGIN
3737
VALUE "Comments", "Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+).\0"
3838
VALUE "CompanyName", "g10 Code GmbH\0"
3939
VALUE "FileDescription", "Libgcrypt - The GNU Crypto Library\0"
40-
VALUE "FileVersion", "22.2.3.5600d2d\0"
40+
VALUE "FileVersion", "22.2.4.9377517\0"
4141
VALUE "InternalName", "libgcrypt\0"
4242
VALUE "LegalCopyright", "Copyright � 2018 Free Software Foundation, Inc.\0"
4343
VALUE "LegalTrademarks", "\0"
4444
VALUE "OriginalFilename", "libgcrypt.dll\0"
4545
VALUE "PrivateBuild", "\0"
4646
VALUE "ProductName", "libgcrypt\0"
47-
VALUE "ProductVersion", "1.8.3\0"
48-
VALUE "SpecialBuild", "2018-06-17T12:43+0000\0"
47+
VALUE "ProductVersion", "1.8.4\0"
48+
VALUE "SpecialBuild", "2018-11-10T10:56+0000\0"
4949
END
5050
END
5151
END

0 commit comments

Comments
 (0)