I am uploading a NMU to DELAYED/1 so that this reaches bookworm within the
current freeze period.
The debdiff is attached but also available in git.
diff -Nru argon2-0~20171227/Argon2.sln argon2-0~20190702/Argon2.sln
--- argon2-0~20171227/Argon2.sln 2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/Argon2.sln 2019-05-20 11:18:00.000000000 +0200
@@ -1,8 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Argon2OptTestCI",
"vs2015\Argon2OptTestCI\Argon2OptTestCI.vcxproj",
"{12956597-5E42-433A-93F3-D4EFF50AA207}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Argon2RefTestCI",
"vs2015\Argon2RefTestCI\Argon2RefTestCI.vcxproj",
"{8A1F7F84-34AF-4DB2-9D58-D4823DFE79E9}"
diff -Nru argon2-0~20171227/debian/changelog argon2-0~20190702/debian/changelog
--- argon2-0~20171227/debian/changelog 2022-02-13 10:41:34.000000000 +0100
+++ argon2-0~20190702/debian/changelog 2023-02-28 11:58:57.000000000 +0100
@@ -1,3 +1,24 @@
+argon2 (0~20190702-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * Only build udeb without threads (Closes: #1014110)
+
+ [ Ondřej Nový ]
+ * d/copyright: Use https protocol in Format field (Closes: #1032102)
+ * New upstream version 0~20190702 (Closes: #1012682)
+
+ [ Laurent Bigonville ]
+ * debian/patches/: Refresh the patches
+ * Drop transitional libargon2-0 package (Closes: #902858)
+
+ [ Debian Janitor ]
+ * Set upstream metadata fields: Bug-Database.
+ * Set upstream metadata fields: Bug-Submit.
+ * Remove constraints unnecessary since buster (oldstable):
+ + Build-Depends: Drop versioned constraint on dh-exec.
+
+ -- Bastian Germann <b...@debian.org> Tue, 28 Feb 2023 11:58:57 +0100
+
argon2 (0~20171227-0.3) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru argon2-0~20171227/debian/control argon2-0~20190702/debian/control
--- argon2-0~20171227/debian/control 2022-02-13 10:41:34.000000000 +0100
+++ argon2-0~20190702/debian/control 2023-02-28 11:53:59.000000000 +0100
@@ -2,7 +2,7 @@
Priority: optional
Maintainer: Luca Bruno <lu...@debian.org>
Build-Depends: debhelper (>= 9),
- dh-exec (>=0.3)
+ dh-exec
Standards-Version: 4.1.4
Section: libs
Homepage: https://github.com/P-H-C/phc-winner-argon2
@@ -13,9 +13,6 @@
Section: libdevel
Architecture: any
Depends: libargon2-1 (= ${binary:Version}), ${misc:Depends}
-Provides: libargon2-0-dev
-Replaces: libargon2-0-dev
-Conflicts: libargon2-0-dev
Multi-Arch: same
Description: memory-hard hashing function - development files
Argon2 is a password-hashing function that can be used to hash passwords
@@ -34,28 +31,6 @@
This package contains headers and libraries for developing program based
on argon2.
-Package: libargon2-0
-Section: libdevel
-Architecture: any
-Depends: libargon2-1 (= ${binary:Version})
-Description: memory-hard hashing function - runtime library
- Argon2 is a password-hashing function that can be used to hash passwords
- for credential storage, key derivation, or other applications.
- .
- There are two main versions of Argon2: Argon2i and Argon2d.
- Argon2i is the safest against side-channel attacks, while Argon2d provides
- the highest resistance against GPU cracking attacks.
- .
- Argon2i and Argon2d are parametrized by:
- * A time cost, which defines the amount of computation realized and
- therefore the execution time, given in number of iterations
- * A memory cost, which defines the memory usage, given in kibibytes
- * A parallelism degree, which defines the number of parallel threads
- .
- This package provides compatibility for packages built against older
- versions of libargon2.
-
-
Package: libargon2-1
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
diff -Nru argon2-0~20171227/debian/copyright argon2-0~20190702/debian/copyright
--- argon2-0~20171227/debian/copyright 2022-02-13 10:41:34.000000000 +0100
+++ argon2-0~20190702/debian/copyright 2023-02-28 11:53:59.000000000 +0100
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: phc-winner-argon2
Source: https://github.com/P-H-C/phc-winner-argon2
Upstream-Contact: https://github.com/P-H-C/phc-winner-argon2/issues
diff -Nru argon2-0~20171227/debian/libargon2-0.links
argon2-0~20190702/debian/libargon2-0.links
--- argon2-0~20171227/debian/libargon2-0.links 2022-02-13 10:41:34.000000000
+0100
+++ argon2-0~20190702/debian/libargon2-0.links 1970-01-01 01:00:00.000000000
+0100
@@ -1,2 +0,0 @@
-#!/usr/bin/dh-exec
-usr/lib/${DEB_HOST_MULTIARCH}/${SONAME}
usr/lib/${DEB_HOST_MULTIARCH}/libargon2.so.0
diff -Nru argon2-0~20171227/debian/patches/hurd
argon2-0~20190702/debian/patches/hurd
--- argon2-0~20171227/debian/patches/hurd 2022-02-13 10:41:34.000000000
+0100
+++ argon2-0~20190702/debian/patches/hurd 2023-02-28 11:53:59.000000000
+0100
@@ -1,11 +1,9 @@
-Index: argon2-0~20171227/Makefile
-===================================================================
---- argon2-0~20171227.orig/Makefile
-+++ argon2-0~20171227/Makefile
-@@ -58,7 +58,7 @@ BUILD_PATH := $(shell pwd)
- KERNEL_NAME := $(shell uname -s)
+--- a/Makefile
++++ b/Makefile
+@@ -69,7 +69,7 @@ LIB_NAME = argon2
+ PC_NAME = lib$(LIB_NAME).pc
+ PC_SRC = $(PC_NAME).in
- LIB_NAME=argon2
-ifeq ($(KERNEL_NAME), Linux)
+ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),Linux GNU))
LIB_EXT := so.$(ABI_VERSION)
diff -Nru argon2-0~20171227/debian/patches/kfreebsd
argon2-0~20190702/debian/patches/kfreebsd
--- argon2-0~20171227/debian/patches/kfreebsd 2022-02-13 10:41:34.000000000
+0100
+++ argon2-0~20190702/debian/patches/kfreebsd 2023-02-28 11:53:59.000000000
+0100
@@ -1,9 +1,9 @@
--- a/Makefile
+++ b/Makefile
-@@ -58,7 +58,7 @@ BUILD_PATH := $(shell pwd)
- KERNEL_NAME := $(shell uname -s)
+@@ -69,7 +69,7 @@ LIB_NAME = argon2
+ PC_NAME = lib$(LIB_NAME).pc
+ PC_SRC = $(PC_NAME).in
- LIB_NAME=argon2
-ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),Linux GNU))
+ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),Linux GNU GNU/kFreeBSD))
LIB_EXT := so.$(ABI_VERSION)
diff -Nru argon2-0~20171227/debian/rules argon2-0~20190702/debian/rules
--- argon2-0~20171227/debian/rules 2022-02-13 10:41:34.000000000 +0100
+++ argon2-0~20190702/debian/rules 2023-02-28 11:58:57.000000000 +0100
@@ -15,22 +15,20 @@
export SOPKG=$(PKG)-$(SOVER)
export SOVER=1
export DEBPREFIX=0~
-export UPSTREAMVER=$(subst $(DEBPREFIX),,$(DEB_VERSION_UPSTREAM))
+export ARGON2_VERSION=$(subst $(DEBPREFIX),,$(DEB_VERSION_UPSTREAM))
export UDEBLIB=$(SONAME).udeb
%:
dh $@
override_dh_auto_build:
- dh_auto_build -- NO_THREADS=1
+ dh_auto_build -- NO_THREADS=1 libs
mv $(SONAME) $(UDEBLIB)
+ $(MAKE) clean
dh_auto_build
override_dh_install:
dh_install
- sed -i '/^## /d'
debian/${PKG}-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libargon2.pc
- sed -i s/@HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/
debian/${PKG}-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libargon2.pc
- sed -i s/@UPSTREAM_VER@/$(UPSTREAMVER)/
debian/${PKG}-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/libargon2.pc
install -D $(UDEBLIB)
debian/$(SOPKG)-udeb/usr/lib/$(DEB_HOST_MULTIARCH)/$(SONAME)
override_dh_auto_clean:
diff -Nru argon2-0~20171227/debian/upstream/metadata
argon2-0~20190702/debian/upstream/metadata
--- argon2-0~20171227/debian/upstream/metadata 1970-01-01 01:00:00.000000000
+0100
+++ argon2-0~20190702/debian/upstream/metadata 2023-02-28 11:53:59.000000000
+0100
@@ -0,0 +1,2 @@
+Bug-Database: https://github.com/p-h-c/phc-winner-argon2/issues
+Bug-Submit: https://github.com/p-h-c/phc-winner-argon2/issues/new
diff -Nru argon2-0~20171227/include/argon2.h argon2-0~20190702/include/argon2.h
--- argon2-0~20171227/include/argon2.h 2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/include/argon2.h 2019-05-20 11:18:00.000000000 +0200
@@ -93,7 +93,7 @@
#define ARGON2_FLAG_CLEAR_SECRET (UINT32_C(1) << 1)
/* Global flag to determine if we are wiping internal memory buffers. This flag
- * is defined in core.c and deafults to 1 (wipe internal memory). */
+ * is defined in core.c and defaults to 1 (wipe internal memory). */
extern int FLAG_clear_internal_memory;
/* Error codes */
diff -Nru argon2-0~20171227/libargon2.pc argon2-0~20190702/libargon2.pc
--- argon2-0~20171227/libargon2.pc 2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/libargon2.pc 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-# libargon2 info for pkg-config
-## Template for downstream installers:
-## - replace @HOST_MULTIARCH@ with target arch, eg 'x86_64-linux-gnu'
-## - replace @UPSTREAM_VER@ with current version, eg '20160406'
-
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib/@HOST_MULTIARCH@
-includedir=${prefix}/include
-
-Name: libargon2
-Description: Development libraries for libargon2
-Version: @UPSTREAM_VER@
-Libs: -L${libdir} -largon2 -lrt -ldl
-Cflags:
-URL: https://github.com/P-H-C/phc-winner-argon2
diff -Nru argon2-0~20171227/libargon2.pc.in argon2-0~20190702/libargon2.pc.in
--- argon2-0~20171227/libargon2.pc.in 1970-01-01 01:00:00.000000000 +0100
+++ argon2-0~20190702/libargon2.pc.in 2019-05-20 11:18:00.000000000 +0200
@@ -0,0 +1,18 @@
+# libargon2 info for pkg-config
+## Template for downstream installers:
+## - replace @UPSTREAM_VER@ with current version, e.g. '20160406'
+## - replace @HOST_MULTIARCH@ with target arch lib, e.g. 'lib',
'lib/x86_64-linux-gnu' or 'lib64'
+## - replace @PREFIX@ with install path, e.g. '/usr', '/usr/local', '/usr/pkg'
+## - replace @INCLUDE@ with incluse path, e.g. 'include' or 'include/argon2'
+
+prefix=@PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/@HOST_MULTIARCH@
+includedir=${prefix}/@INCLUDE@
+
+Name: libargon2
+Description: Development libraries for libargon2
+Version: @UPSTREAM_VER@
+Libs: -L${libdir} -largon2 @EXTRA_LIBS@
+Cflags: -I${includedir}
+URL: https://github.com/P-H-C/phc-winner-argon2
diff -Nru argon2-0~20171227/Makefile argon2-0~20190702/Makefile
--- argon2-0~20171227/Makefile 2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/Makefile 2019-05-20 11:18:00.000000000 +0200
@@ -18,6 +18,13 @@
RUN = argon2
BENCH = bench
GENKAT = genkat
+ARGON2_VERSION ?= ZERO
+
+# installation parameters for staging area and final installation path
+# Note; if Linux and not Debian/Ubuntu version also add lib override to make
command-line
+# for RedHat/Fedora, add: LIBRARY_REL=lib64
+DESTDIR ?=
+PREFIX ?= /usr
# Increment on an ABI breaking change
ABI_VERSION = 1
@@ -56,40 +63,51 @@
BUILD_PATH := $(shell pwd)
KERNEL_NAME := $(shell uname -s)
+MACHINE_NAME := $(shell uname -m)
+
+LIB_NAME = argon2
+PC_NAME = lib$(LIB_NAME).pc
+PC_SRC = $(PC_NAME).in
-LIB_NAME=argon2
ifeq ($(KERNEL_NAME), Linux)
LIB_EXT := so.$(ABI_VERSION)
LIB_CFLAGS := -shared -fPIC -fvisibility=hidden -DA2_VISCTL=1
SO_LDFLAGS := -Wl,-soname,lib$(LIB_NAME).$(LIB_EXT)
LINKED_LIB_EXT := so
+ PC_EXTRA_LIBS ?= -lrt -ldl
endif
-ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),FreeBSD NetBSD OpenBSD))
+ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),DragonFly FreeBSD NetBSD
OpenBSD))
LIB_EXT := so
LIB_CFLAGS := -shared -fPIC
+ PC_EXTRA_LIBS ?=
endif
ifeq ($(KERNEL_NAME), Darwin)
LIB_EXT := $(ABI_VERSION).dylib
LIB_CFLAGS := -dynamiclib -install_name @rpath/lib$(LIB_NAME).$(LIB_EXT)
LINKED_LIB_EXT := dylib
+ PC_EXTRA_LIBS ?=
endif
ifeq ($(findstring CYGWIN, $(KERNEL_NAME)), CYGWIN)
LIB_EXT := dll
LIB_CFLAGS := -shared -Wl,--out-implib,lib$(LIB_NAME).$(LIB_EXT).a
+ PC_EXTRA_LIBS ?=
endif
ifeq ($(findstring MINGW, $(KERNEL_NAME)), MINGW)
LIB_EXT := dll
LIB_CFLAGS := -shared -Wl,--out-implib,lib$(LIB_NAME).$(LIB_EXT).a
+ PC_EXTRA_LIBS ?=
endif
ifeq ($(findstring MSYS, $(KERNEL_NAME)), MSYS)
LIB_EXT := dll
LIB_CFLAGS := -shared -Wl,--out-implib,lib$(LIB_NAME).$(LIB_EXT).a
+ PC_EXTRA_LIBS ?=
endif
ifeq ($(KERNEL_NAME), SunOS)
CC := gcc
CFLAGS += -D_REENTRANT
LIB_EXT := so
LIB_CFLAGS := -shared -fPIC
+ PC_EXTRA_LIBS ?=
endif
ifeq ($(KERNEL_NAME), Linux)
@@ -111,20 +129,45 @@
INSTALL = install
-DESTDIR =
-PREFIX = /usr
-INCLUDE_REL = include
-LIBRARY_REL = lib
-BINARY_REL = bin
+# relative paths for different OS
+ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),DragonFly FreeBSD))
+
+# default for FreeBSD
+BINARY_REL ?= bin
+INCLUDE_REL ?= include
+LIBRARY_REL ?= lib
+PKGCONFIG_REL ?= libdata
+
+else ifeq ($(KERNEL_NAME)-$(MACHINE_NAME), Linux-x86_64)
+
+# default for Debian/Ubuntu x86_64
+BINARY_REL ?= bin
+INCLUDE_REL ?= include
+LIBRARY_REL ?= lib/x86_64-linux-gnu
+PKGCONFIG_REL ?= $(LIBRARY_REL)
+
+else
+
+# NetBSD, ... and Linux64/Linux32 variants that use plain lib directory
+BINARY_REL ?= bin
+INCLUDE_REL ?= include
+LIBRARY_REL ?= lib
+PKGCONFIG_REL ?= $(LIBRARY_REL)
+
+endif
+# absolute paths to staging area
INST_INCLUDE = $(DESTDIR)$(PREFIX)/$(INCLUDE_REL)
INST_LIBRARY = $(DESTDIR)$(PREFIX)/$(LIBRARY_REL)
INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINARY_REL)
+INST_PKGCONFIG = $(DESTDIR)$(PREFIX)/$(PKGCONFIG_REL)/pkgconfig
-.PHONY: clean dist format $(GENKAT) all install
-
+# main target
+.PHONY: all
all: $(RUN) libs
-libs: $(LIBRARIES)
+
+.PHONY: libs
+libs: $(LIBRARIES) $(PC_NAME)
$(RUN): $(SRC) $(SRC_RUN)
$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
@@ -141,47 +184,70 @@
$(LIB_ST): $(OBJ)
ar rcs $@ $^
+.PHONY: clean
clean:
- rm -f $(RUN) $(BENCH) $(GENKAT)
- rm -f $(LIB_SH) $(LIB_ST) kat-argon2*
+ rm -f '$(RUN)' '$(BENCH)' '$(GENKAT)'
+ rm -f '$(LIB_SH)' '$(LIB_ST)' kat-argon2* '$(PC_NAME)'
rm -f testcase
rm -rf *.dSYM
cd src/ && rm -f *.o
cd src/blake2/ && rm -f *.o
cd kats/ && rm -f kat-* diff* run_* make_*
+
+# all substitutions to pc template
+SED_COMMANDS = /^\#\#.*$$/d;
+SED_COMMANDS += s\#@PREFIX@\#$(PREFIX)\#g;
+SED_COMMANDS += s\#@EXTRA_LIBS@\#$(PC_EXTRA_LIBS)\#g;
+SED_COMMANDS += s\#@UPSTREAM_VER@\#$(ARGON2_VERSION)\#g;
+SED_COMMANDS += s\#@HOST_MULTIARCH@\#$(LIBRARY_REL)\#g;
+SED_COMMANDS += s\#@INCLUDE@\#$(INCLUDE_REL)\#g;
+
+# substitute PREFIX and PC_EXTRA_LIBS into pkgconfig pc file
+$(PC_NAME): $(PC_SRC)
+ sed '$(SED_COMMANDS)' < '$(PC_SRC)' > '$@'
+
+
+.PHONY: dist
dist:
cd ..; \
tar -c --exclude='.??*' -z -f $(DIST)-`date "+%Y%m%d"`.tgz
$(DIST)/*
+.PHONY: test
test: $(SRC) src/test.c
$(CC) $(CFLAGS) -Wextra -Wno-type-limits $^ -o testcase
@sh kats/test.sh
./testcase
+.PHONY: testci
testci: $(SRC) src/test.c
$(CC) $(CI_CFLAGS) $^ -o testcase
@sh kats/test.sh
./testcase
-.PHONY: test
+.PHONY: format
format:
clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
-i include/*.h src/*.c src/*.h src/blake2/*.c
src/blake2/*.h
+.PHONY: install
install: $(RUN) libs
$(INSTALL) -d $(INST_INCLUDE)
$(INSTALL) -m 0644 $(HEADERS) $(INST_INCLUDE)
$(INSTALL) -d $(INST_LIBRARY)
- $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
+ $(INSTALL) -m 0644 $(LIBRARIES) $(INST_LIBRARY)
ifdef LINKED_LIB_SH
cd $(INST_LIBRARY) && ln -s $(notdir $(LIB_SH) $(LINKED_LIB_SH))
endif
$(INSTALL) -d $(INST_BINARY)
$(INSTALL) $(RUN) $(INST_BINARY)
+ $(INSTALL) -d $(INST_PKGCONFIG)
+ $(INSTALL) -m 0644 $(PC_NAME) $(INST_PKGCONFIG)
+.PHONY: uninstall
uninstall:
cd $(INST_INCLUDE) && rm -f $(notdir $(HEADERS))
cd $(INST_LIBRARY) && rm -f $(notdir $(LIBRARIES) $(LINKED_LIB_SH))
cd $(INST_BINARY) && rm -f $(notdir $(RUN))
+ cd $(INST_PKG_CONFIG) && rm -f $(notdir $(PC_NAME))
diff -Nru argon2-0~20171227/README.md argon2-0~20190702/README.md
--- argon2-0~20171227/README.md 2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/README.md 2019-05-20 11:18:00.000000000 +0200
@@ -191,9 +191,9 @@
}
```
-To use Argon2d instead of Argon2i call `argon2d_hash` instead of
-`argon2i_hash` using the high-level API, and `argon2d` instead of
-`argon2i` using the low-level API. Similarly for Argon2id, call
`argond2id_hash`
+To use Argon2d instead of Argon2i call `argon2d_hash_raw` instead of
+`argon2i_hash_raw` using the high-level API, and `argon2d` instead of
+`argon2i` using the low-level API. Similarly for Argon2id, call
`argon2id_hash_raw`
and `argon2id`.
To produce the crypt-like encoding rather than the raw hash, call
@@ -244,13 +244,15 @@
their documentation):
* [Elixir](https://github.com/riverrun/argon2_elixir) by
[@riverrun](https://github.com/riverrun)
+* [Erlang](https://github.com/ergenius/eargon2) by
[@ergenius](https://github.com/ergenius)
* [Go](https://github.com/tvdburgt/go-argon2) by
[@tvdburgt](https://github.com/tvdburgt)
-*
[Haskell](https://hackage.haskell.org/package/argon2-1.0.0/docs/Crypto-Argon2.html)
by [@ocharles](https://github.com/ocharles)
+* [Haskell](https://hackage.haskell.org/package/argon2) by
[@hvr](https://github.com/hvr)
* [JavaScript (native)](https://github.com/ranisalt/node-argon2), by
[@ranisalt](https://github.com/ranisalt)
* [JavaScript (native)](https://github.com/jdconley/argon2themax), by
[@jdconley](https://github.com/jdconley)
* [JavaScript (ffi)](https://github.com/cjlarose/argon2-ffi), by
[@cjlarose](https://github.com/cjlarose)
* [JavaScript (browser)](https://github.com/antelle/argon2-browser), by
[@antelle](https://github.com/antelle)
* [JVM](https://github.com/phxql/argon2-jvm) by
[@phXql](https://github.com/phxql)
+* [JVM (with keyed hashing)](https://github.com/kosprov/jargon2-api) by
[@kosprov](https://github.com/kosprov)
* [Lua (native)](https://github.com/thibaultCha/lua-argon2) by
[@thibaultCha](https://github.com/thibaultCha)
* [Lua (ffi)](https://github.com/thibaultCha/lua-argon2-ffi) by
[@thibaultCha](https://github.com/thibaultCha)
* [OCaml](https://github.com/Khady/ocaml-argon2) by
[@Khady](https://github.com/Khady)
@@ -260,6 +262,7 @@
* [R](https://cran.r-project.org/package=argon2) by
[@wrathematics](https://github.com/wrathematics)
* [Ruby](https://github.com/technion/ruby-argon2) by
[@technion](https://github.com/technion)
* [Rust](https://github.com/quininer/argon2-rs) by
[@quininer](https://github.com/quininer)
+* [Rust](https://docs.rs/argonautica/) by
[@bcmyers](https://github.com/bcmyers/)
* [C#/.NET
CoreCLR](https://github.com/kmaragon/Konscious.Security.Cryptography) by
[@kmaragon](https://github.com/kmaragon)
* [Perl](https://github.com/Leont/crypt-argon2) by
[@leont](https://github.com/Leont)
* [mruby](https://github.com/Asmod4n/mruby-argon2) by
[@Asmod4n](https://github.com/Asmod4n)
diff -Nru argon2-0~20171227/src/core.c argon2-0~20190702/src/core.c
--- argon2-0~20171227/src/core.c 2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/src/core.c 2019-05-20 11:18:00.000000000 +0200
@@ -25,6 +25,9 @@
#endif
#define VC_GE_2005(version) (version >= 1400)
+/* for explicit_bzero() on glibc */
+#define _DEFAULT_SOURCE
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -120,12 +123,20 @@
}
}
+#if defined(__OpenBSD__)
+#define HAVE_EXPLICIT_BZERO 1
+#elif defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+#if __GLIBC_PREREQ(2,25)
+#define HAVE_EXPLICIT_BZERO 1
+#endif
+#endif
+
void NOT_OPTIMIZED secure_wipe_memory(void *v, size_t n) {
#if defined(_MSC_VER) && VC_GE_2005(_MSC_VER)
SecureZeroMemory(v, n);
#elif defined memset_s
memset_s(v, n, 0, n);
-#elif defined(__OpenBSD__)
+#elif defined(HAVE_EXPLICIT_BZERO)
explicit_bzero(v, n);
#else
static void *(*const volatile memset_sec)(void *, int, size_t) = &memset;
@@ -299,7 +310,7 @@
for (r = 0; r < instance->passes; ++r) {
for (s = 0; s < ARGON2_SYNC_POINTS; ++s) {
- uint32_t l;
+ uint32_t l, ll;
/* 2. Calling threads */
for (l = 0; l < instance->lanes; ++l) {
@@ -324,6 +335,9 @@
sizeof(argon2_position_t));
if (argon2_thread_create(&thread[l], &fill_segment_thr,
(void *)&thr_data[l])) {
+ /* Wait for already running threads */
+ for (ll = 0; ll < l; ++ll)
+ argon2_thread_join(thread[ll]);
rc = ARGON2_THREAD_FAIL;
goto fail;
}
diff -Nru argon2-0~20171227/src/genkat.h argon2-0~20190702/src/genkat.h
--- argon2-0~20171227/src/genkat.h 2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/src/genkat.h 2019-05-20 11:18:00.000000000 +0200
@@ -18,6 +18,8 @@
#ifndef ARGON2_KAT_H
#define ARGON2_KAT_H
+#include "core.h"
+
/*
* Initial KAT function that prints the inputs to the file
* @param blockhash Array that contains pre-hashing digest
diff -Nru argon2-0~20171227/src/test.c argon2-0~20190702/src/test.c
--- argon2-0~20171227/src/test.c 2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/src/test.c 2019-05-20 11:18:00.000000000 +0200
@@ -35,7 +35,7 @@
*/
void hashtest(uint32_t version, uint32_t t, uint32_t m, uint32_t p, char *pwd,
- char *salt, char *hexref, char *mcfref) {
+ char *salt, char *hexref, char *mcfref, argon2_type type) {
unsigned char out[OUT_LEN];
unsigned char hex_out[OUT_LEN * 2 + 4];
char encoded[ENCODED_LEN];
@@ -45,21 +45,20 @@
t, m, p, pwd, salt);
ret = argon2_hash(t, 1 << m, p, pwd, strlen(pwd), salt, strlen(salt), out,
- OUT_LEN, encoded, ENCODED_LEN, Argon2_i, version);
+ OUT_LEN, encoded, ENCODED_LEN, type, version);
assert(ret == ARGON2_OK);
for (i = 0; i < OUT_LEN; ++i)
sprintf((char *)(hex_out + i * 2), "%02x", out[i]);
-
assert(memcmp(hex_out, hexref, OUT_LEN * 2) == 0);
if (ARGON2_VERSION_NUMBER == version) {
assert(memcmp(encoded, mcfref, strlen(mcfref)) == 0);
}
- ret = argon2_verify(encoded, pwd, strlen(pwd), Argon2_i);
+ ret = argon2_verify(encoded, pwd, strlen(pwd), type);
assert(ret == ARGON2_OK);
- ret = argon2_verify(mcfref, pwd, strlen(pwd), Argon2_i);
+ ret = argon2_verify(mcfref, pwd, strlen(pwd), type);
assert(ret == ARGON2_OK);
printf("PASS\n");
@@ -78,41 +77,41 @@
hashtest(version, 2, 16, 1, "password", "somesalt",
"f6c4db4a54e2a370627aff3db6176b94a2a209a62c8e36152711802f7b30c694",
"$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ");
+ "$9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ", Argon2_i);
#ifdef TEST_LARGE_RAM
hashtest(version, 2, 20, 1, "password", "somesalt",
"9690ec55d28d3ed32562f2e73ea62b02b018757643a2ae6e79528459de8106e9",
"$argon2i$m=1048576,t=2,p=1$c29tZXNhbHQ"
- "$lpDsVdKNPtMlYvLnPqYrArAYdXZDoq5ueVKEWd6BBuk");
+ "$lpDsVdKNPtMlYvLnPqYrArAYdXZDoq5ueVKEWd6BBuk", Argon2_i);
#endif
hashtest(version, 2, 18, 1, "password", "somesalt",
"3e689aaa3d28a77cf2bc72a51ac53166761751182f1ee292e3f677a7da4c2467",
"$argon2i$m=262144,t=2,p=1$c29tZXNhbHQ"
- "$Pmiaqj0op3zyvHKlGsUxZnYXURgvHuKS4/Z3p9pMJGc");
+ "$Pmiaqj0op3zyvHKlGsUxZnYXURgvHuKS4/Z3p9pMJGc", Argon2_i);
hashtest(version, 2, 8, 1, "password", "somesalt",
"fd4dd83d762c49bdeaf57c47bdcd0c2f1babf863fdeb490df63ede9975fccf06",
"$argon2i$m=256,t=2,p=1$c29tZXNhbHQ"
- "$/U3YPXYsSb3q9XxHvc0MLxur+GP960kN9j7emXX8zwY");
+ "$/U3YPXYsSb3q9XxHvc0MLxur+GP960kN9j7emXX8zwY", Argon2_i);
hashtest(version, 2, 8, 2, "password", "somesalt",
"b6c11560a6a9d61eac706b79a2f97d68b4463aa3ad87e00c07e2b01e90c564fb",
"$argon2i$m=256,t=2,p=2$c29tZXNhbHQ"
- "$tsEVYKap1h6scGt5ovl9aLRGOqOth+AMB+KwHpDFZPs");
+ "$tsEVYKap1h6scGt5ovl9aLRGOqOth+AMB+KwHpDFZPs", Argon2_i);
hashtest(version, 1, 16, 1, "password", "somesalt",
"81630552b8f3b1f48cdb1992c4c678643d490b2b5eb4ff6c4b3438b5621724b2",
"$argon2i$m=65536,t=1,p=1$c29tZXNhbHQ"
- "$gWMFUrjzsfSM2xmSxMZ4ZD1JCytetP9sSzQ4tWIXJLI");
+ "$gWMFUrjzsfSM2xmSxMZ4ZD1JCytetP9sSzQ4tWIXJLI", Argon2_i);
hashtest(version, 4, 16, 1, "password", "somesalt",
"f212f01615e6eb5d74734dc3ef40ade2d51d052468d8c69440a3a1f2c1c2847b",
"$argon2i$m=65536,t=4,p=1$c29tZXNhbHQ"
- "$8hLwFhXm6110c03D70Ct4tUdBSRo2MaUQKOh8sHChHs");
+ "$8hLwFhXm6110c03D70Ct4tUdBSRo2MaUQKOh8sHChHs", Argon2_i);
hashtest(version, 2, 16, 1, "differentpassword", "somesalt",
"e9c902074b6754531a3a0be519e5baf404b30ce69b3f01ac3bf21229960109a3",
"$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$6ckCB0tnVFMaOgvlGeW69ASzDOabPwGsO/ISKZYBCaM");
+ "$6ckCB0tnVFMaOgvlGeW69ASzDOabPwGsO/ISKZYBCaM", Argon2_i);
hashtest(version, 2, 16, 1, "password", "diffsalt",
"79a103b90fe8aef8570cb31fc8b22259778916f8336b7bdac3892569d4f1c497",
"$argon2i$m=65536,t=2,p=1$ZGlmZnNhbHQ"
- "$eaEDuQ/orvhXDLMfyLIiWXeJFvgza3vaw4kladTxxJc");
+ "$eaEDuQ/orvhXDLMfyLIiWXeJFvgza3vaw4kladTxxJc", Argon2_i);
/* Error state tests */
@@ -157,41 +156,42 @@
hashtest(version, 2, 16, 1, "password", "somesalt",
"c1628832147d9720c5bd1cfd61367078729f6dfb6f8fea9ff98158e0d7816ed0",
"$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA");
+ "$wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA", Argon2_i);
#ifdef TEST_LARGE_RAM
hashtest(version, 2, 20, 1, "password", "somesalt",
"d1587aca0922c3b5d6a83edab31bee3c4ebaef342ed6127a55d19b2351ad1f41",
"$argon2i$v=19$m=1048576,t=2,p=1$c29tZXNhbHQ"
- "$0Vh6ygkiw7XWqD7asxvuPE667zQu1hJ6VdGbI1GtH0E");
+ "$0Vh6ygkiw7XWqD7asxvuPE667zQu1hJ6VdGbI1GtH0E", Argon2_i);
#endif
hashtest(version, 2, 18, 1, "password", "somesalt",
"296dbae80b807cdceaad44ae741b506f14db0959267b183b118f9b24229bc7cb",
"$argon2i$v=19$m=262144,t=2,p=1$c29tZXNhbHQ"
- "$KW266AuAfNzqrUSudBtQbxTbCVkmexg7EY+bJCKbx8s");
+ "$KW266AuAfNzqrUSudBtQbxTbCVkmexg7EY+bJCKbx8s", Argon2_i);
hashtest(version, 2, 8, 1, "password", "somesalt",
"89e9029f4637b295beb027056a7336c414fadd43f6b208645281cb214a56452f",
"$argon2i$v=19$m=256,t=2,p=1$c29tZXNhbHQ"
- "$iekCn0Y3spW+sCcFanM2xBT63UP2sghkUoHLIUpWRS8");
+ "$iekCn0Y3spW+sCcFanM2xBT63UP2sghkUoHLIUpWRS8", Argon2_i);
hashtest(version, 2, 8, 2, "password", "somesalt",
"4ff5ce2769a1d7f4c8a491df09d41a9fbe90e5eb02155a13e4c01e20cd4eab61",
"$argon2i$v=19$m=256,t=2,p=2$c29tZXNhbHQ"
- "$T/XOJ2mh1/TIpJHfCdQan76Q5esCFVoT5MAeIM1Oq2E");
+ "$T/XOJ2mh1/TIpJHfCdQan76Q5esCFVoT5MAeIM1Oq2E", Argon2_i);
hashtest(version, 1, 16, 1, "password", "somesalt",
"d168075c4d985e13ebeae560cf8b94c3b5d8a16c51916b6f4ac2da3ac11bbecf",
"$argon2i$v=19$m=65536,t=1,p=1$c29tZXNhbHQ"
- "$0WgHXE2YXhPr6uVgz4uUw7XYoWxRkWtvSsLaOsEbvs8");
+ "$0WgHXE2YXhPr6uVgz4uUw7XYoWxRkWtvSsLaOsEbvs8", Argon2_i);
hashtest(version, 4, 16, 1, "password", "somesalt",
"aaa953d58af3706ce3df1aefd4a64a84e31d7f54175231f1285259f88174ce5b",
"$argon2i$v=19$m=65536,t=4,p=1$c29tZXNhbHQ"
- "$qqlT1YrzcGzj3xrv1KZKhOMdf1QXUjHxKFJZ+IF0zls");
+ "$qqlT1YrzcGzj3xrv1KZKhOMdf1QXUjHxKFJZ+IF0zls", Argon2_i);
hashtest(version, 2, 16, 1, "differentpassword", "somesalt",
"14ae8da01afea8700c2358dcef7c5358d9021282bd88663a4562f59fb74d22ee",
"$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
- "$FK6NoBr+qHAMI1jc73xTWNkCEoK9iGY6RWL1n7dNIu4");
+ "$FK6NoBr+qHAMI1jc73xTWNkCEoK9iGY6RWL1n7dNIu4", Argon2_i);
hashtest(version, 2, 16, 1, "password", "diffsalt",
"b0357cccfbef91f3860b0dba447b2348cbefecadaf990abfe9cc40726c521271",
"$argon2i$v=19$m=65536,t=2,p=1$ZGlmZnNhbHQ"
- "$sDV8zPvvkfOGCw26RHsjSMvv7K2vmQq/6cxAcmxSEnE");
+ "$sDV8zPvvkfOGCw26RHsjSMvv7K2vmQq/6cxAcmxSEnE", Argon2_i);
+
/* Error state tests */
@@ -225,7 +225,43 @@
msg = argon2_error_message(ARGON2_DECODING_FAIL);
assert(strcmp(msg, "Decoding failed") == 0);
- printf("Decode an error message: PASS\n");
+ printf("Decode an error message: PASS\n\n");
+
+ printf("Test Argon2id version number: %02x\n", version);
+
+ /* Multiple test cases for various input values */
+ hashtest(version, 2, 16, 1, "password", "somesalt",
+
"09316115d5cf24ed5a15a31a3ba326e5cf32edc24702987c02b6566f61913cf7",
+ "$argon2id$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
+ "$CTFhFdXPJO1aFaMaO6Mm5c8y7cJHAph8ArZWb2GRPPc", Argon2_id);
+ hashtest(version, 2, 18, 1, "password", "somesalt",
+
"78fe1ec91fb3aa5657d72e710854e4c3d9b9198c742f9616c2f085bed95b2e8c",
+ "$argon2id$v=19$m=262144,t=2,p=1$c29tZXNhbHQ"
+ "$eP4eyR+zqlZX1y5xCFTkw9m5GYx0L5YWwvCFvtlbLow", Argon2_id);
+ hashtest(version, 2, 8, 1, "password", "somesalt",
+
"9dfeb910e80bad0311fee20f9c0e2b12c17987b4cac90c2ef54d5b3021c68bfe",
+ "$argon2id$v=19$m=256,t=2,p=1$c29tZXNhbHQ"
+ "$nf65EOgLrQMR/uIPnA4rEsF5h7TKyQwu9U1bMCHGi/4", Argon2_id);
+ hashtest(version, 2, 8, 2, "password", "somesalt",
+
"6d093c501fd5999645e0ea3bf620d7b8be7fd2db59c20d9fff9539da2bf57037",
+ "$argon2id$v=19$m=256,t=2,p=2$c29tZXNhbHQ"
+ "$bQk8UB/VmZZF4Oo79iDXuL5/0ttZwg2f/5U52iv1cDc", Argon2_id);
+ hashtest(version, 1, 16, 1, "password", "somesalt",
+
"f6a5adc1ba723dddef9b5ac1d464e180fcd9dffc9d1cbf76cca2fed795d9ca98",
+ "$argon2id$v=19$m=65536,t=1,p=1$c29tZXNhbHQ"
+ "$9qWtwbpyPd3vm1rB1GThgPzZ3/ydHL92zKL+15XZypg", Argon2_id);
+ hashtest(version, 4, 16, 1, "password", "somesalt",
+
"9025d48e68ef7395cca9079da4c4ec3affb3c8911fe4f86d1a2520856f63172c",
+ "$argon2id$v=19$m=65536,t=4,p=1$c29tZXNhbHQ"
+ "$kCXUjmjvc5XMqQedpMTsOv+zyJEf5PhtGiUghW9jFyw", Argon2_id);
+ hashtest(version, 2, 16, 1, "differentpassword", "somesalt",
+
"0b84d652cf6b0c4beaef0dfe278ba6a80df6696281d7e0d2891b817d8c458fde",
+ "$argon2id$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
+ "$C4TWUs9rDEvq7w3+J4umqA32aWKB1+DSiRuBfYxFj94", Argon2_id);
+ hashtest(version, 2, 16, 1, "password", "diffsalt",
+
"bdf32b05ccc42eb15d58fd19b1f856b113da1e9a5874fdcc544308565aa8141c",
+ "$argon2id$v=19$m=65536,t=2,p=1$ZGlmZnNhbHQ"
+ "$vfMrBczELrFdWP0ZsfhWsRPaHppYdP3MVEMIVlqoFBw", Argon2_id);
/* Common error state tests */
@@ -234,18 +270,18 @@
ret = argon2_hash(2, 1, 1, "password", strlen("password"),
"diffsalt", strlen("diffsalt"),
- out, OUT_LEN, NULL, 0, Argon2_i, version);
+ out, OUT_LEN, NULL, 0, Argon2_id, version);
assert(ret == ARGON2_MEMORY_TOO_LITTLE);
printf("Fail on invalid memory: PASS\n");
ret = argon2_hash(2, 1 << 12, 1, NULL, strlen("password"),
"diffsalt", strlen("diffsalt"),
- out, OUT_LEN, NULL, 0, Argon2_i, version);
+ out, OUT_LEN, NULL, 0, Argon2_id, version);
assert(ret == ARGON2_PWD_PTR_MISMATCH);
printf("Fail on invalid null pointer: PASS\n");
ret = argon2_hash(2, 1 << 12, 1, "password", strlen("password"), "s", 1,
- out, OUT_LEN, NULL, 0, Argon2_i, version);
+ out, OUT_LEN, NULL, 0, Argon2_id, version);
assert(ret == ARGON2_SALT_TOO_SHORT);
printf("Fail on salt too short: PASS\n");
diff -Nru argon2-0~20171227/vs2015/Argon2Opt/Argon2Opt.vcxproj
argon2-0~20190702/vs2015/Argon2Opt/Argon2Opt.vcxproj
--- argon2-0~20171227/vs2015/Argon2Opt/Argon2Opt.vcxproj 2017-12-27
20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2Opt/Argon2Opt.vcxproj 2019-05-20
11:18:00.000000000 +0200
@@ -32,43 +32,44 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -154,6 +155,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff -Nru argon2-0~20171227/vs2015/Argon2OptBench/Argon2OptBench.vcxproj
argon2-0~20190702/vs2015/Argon2OptBench/Argon2OptBench.vcxproj
--- argon2-0~20171227/vs2015/Argon2OptBench/Argon2OptBench.vcxproj
2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2OptBench/Argon2OptBench.vcxproj
2019-05-20 11:18:00.000000000 +0200
@@ -32,43 +32,44 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -154,6 +155,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff -Nru argon2-0~20171227/vs2015/Argon2OptDll/Argon2OptDll.vcxproj
argon2-0~20190702/vs2015/Argon2OptDll/Argon2OptDll.vcxproj
--- argon2-0~20171227/vs2015/Argon2OptDll/Argon2OptDll.vcxproj 2017-12-27
20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2OptDll/Argon2OptDll.vcxproj 2019-05-20
11:18:00.000000000 +0200
@@ -32,43 +32,44 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -154,6 +155,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff -Nru argon2-0~20171227/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj
argon2-0~20190702/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj
--- argon2-0~20171227/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj
2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2OptGenKAT/Argon2OptGenKAT.vcxproj
2019-05-20 11:18:00.000000000 +0200
@@ -32,43 +32,44 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -160,6 +161,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -177,6 +179,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -193,6 +196,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -210,6 +214,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff -Nru argon2-0~20171227/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj
argon2-0~20190702/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj
--- argon2-0~20171227/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj
2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2OptTestCI/Argon2OptTestCI.vcxproj
2019-05-20 11:18:00.000000000 +0200
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -33,43 +33,44 @@
<ProjectName>Argon2OptTestCI</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -142,6 +143,9 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -155,6 +159,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -170,6 +175,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -184,6 +190,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -199,6 +206,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -224,4 +232,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ Kein Zeilenumbruch am Dateiende.
diff -Nru argon2-0~20171227/vs2015/Argon2Ref/Argon2Ref.vcxproj
argon2-0~20190702/vs2015/Argon2Ref/Argon2Ref.vcxproj
--- argon2-0~20171227/vs2015/Argon2Ref/Argon2Ref.vcxproj 2017-12-27
20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2Ref/Argon2Ref.vcxproj 2019-05-20
11:18:00.000000000 +0200
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -32,43 +32,44 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -132,7 +133,11 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -140,7 +145,11 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ </Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -150,10 +159,12 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -165,10 +176,12 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -179,10 +192,12 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -194,10 +209,12 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -223,4 +240,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ Kein Zeilenumbruch am Dateiende.
diff -Nru argon2-0~20171227/vs2015/Argon2RefBench/Argon2RefBench.vcxproj
argon2-0~20190702/vs2015/Argon2RefBench/Argon2RefBench.vcxproj
--- argon2-0~20171227/vs2015/Argon2RefBench/Argon2RefBench.vcxproj
2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2RefBench/Argon2RefBench.vcxproj
2019-05-20 11:18:00.000000000 +0200
@@ -32,43 +32,44 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -154,6 +155,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff -Nru argon2-0~20171227/vs2015/Argon2RefDll/Argon2RefDll.vcxproj
argon2-0~20190702/vs2015/Argon2RefDll/Argon2RefDll.vcxproj
--- argon2-0~20171227/vs2015/Argon2RefDll/Argon2RefDll.vcxproj 2017-12-27
20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2RefDll/Argon2RefDll.vcxproj 2019-05-20
11:18:00.000000000 +0200
@@ -32,43 +32,44 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -154,6 +155,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff -Nru argon2-0~20171227/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj
argon2-0~20190702/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj
--- argon2-0~20171227/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj
2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2RefGenKAT/Argon2RefGenKAT.vcxproj
2019-05-20 11:18:00.000000000 +0200
@@ -32,43 +32,44 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -154,6 +155,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
diff -Nru argon2-0~20171227/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj
argon2-0~20190702/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj
--- argon2-0~20171227/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj
2017-12-27 20:56:31.000000000 +0100
+++ argon2-0~20190702/vs2015/Argon2RefTestCI/Argon2RefTestCI.vcxproj
2019-05-20 11:18:00.000000000 +0200
@@ -32,43 +32,44 @@
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <!-- Set DefaultPlatformToolset to v100 (VS2010) if not defined -->
+ <PropertyGroup Label="EmptyDefaultPlatformToolset">
+ <DefaultPlatformToolset Condition=" '$(DefaultPlatformToolset)' == ''
">v100</DefaultPlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup Label="PlatformToolset">
+ <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+ </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
@@ -154,6 +155,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|Win32'">
@@ -169,6 +171,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -183,6 +186,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='ReleaseStatic|x64'">
@@ -198,6 +202,7 @@
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
