From f35a1bdd529fd2a995984833cf2e2e20810e6545 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 18 Oct 2017 14:15:39 +0000 Subject: [PATCH 01/19] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..6537591 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# argon2 + +The password-hashing tools \ No newline at end of file From 08b2398af1839d43fe7dc7455ab62b4ed1d3ce0f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Oct 2017 17:32:44 +0200 Subject: [PATCH 02/19] import from review #1503609 --- .gitignore | 1 + argon2.spec | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 142 insertions(+) create mode 100644 .gitignore create mode 100644 argon2.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..12fd223 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/phc-winner-argon2-20161029-1c4fc41.tar.gz diff --git a/argon2.spec b/argon2.spec new file mode 100644 index 0000000..e385f85 --- /dev/null +++ b/argon2.spec @@ -0,0 +1,140 @@ +# remirepo/fedora spec file for argon2 +# +# Copyright (c) 2017 Remi Collet +# License: CC-BY-SA +# http://creativecommons.org/licenses/by-sa/4.0/ +# +# Please, preserve the changelog entries +# +%global libname libargon2 +%global gh_commit 1c4fc41f81f358283755eea88d4ecd05e43b7fd3 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner P-H-C +%global gh_project phc-winner-argon2 +%global soname 0 + +%global upstream_version 20161029 +#global upstream_prever RC1 + +Name: argon2 +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Release: 1%{?dist} +Group: Applications/System +Summary: The password-hashing tools + +License: Public Domain or ASL 2.0 +URL: https://github.com/%{gh_owner}/%{gh_project} +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz + +Requires: %{libname}%{?_isa} = %{version}-%{release} + + +%description +Argon2 is a password-hashing function that summarizes the state of the art +in the design of memory-hard functions and can be used to hash passwords +for credential storage, key derivation, or other applications. + +It has a simple design aimed at the highest memory filling rate and +effective use of multiple computing units, while still providing defense +against tradeoff attacks (by exploiting the cache and memory organization +of the recent processors). + +Argon2 has three variants: Argon2i, Argon2d, and Argon2id. + +* Argon2d is faster and uses data-depending memory access, which makes it + highly resistant against GPU cracking attacks and suitable for applications + with no threats from side-channel timing attacks (eg. cryptocurrencies). +* Argon2i instead uses data-independent memory access, which is preferred for + password hashing and password-based key derivation, but it is slower as it + makes more passes over the memory to protect from tradeoff attacks. +* Argon2id is a hybrid of Argon2i and Argon2d, using a combination of + data-depending and data-independent memory accesses, which gives some of + Argon2i's resistance to side-channel cache timing attacks and much of + Argon2d's resistance to GPU cracking attacks. + + +%package -n %{libname} +Group: System Environment/Libraries +Summary: The password-hashing library + +%description -n %{libname} +Argon2 is a password-hashing function that summarizes the state of the art +in the design of memory-hard functions and can be used to hash passwords +for credential storage, key derivation, or other applications. + + +%package -n %{libname}-devel +Group: Development/Libraries +Summary: Development files for %{libname} +Requires: %{libname}%{?_isa} = %{version}-%{release} + +%description -n %{libname}-devel +The %{libname}-devel package contains libraries and header files for +developing applications that use %{libname}. + + +%prep +%setup -qn %{gh_project}-%{gh_commit} + +if ! grep -q 'soname,%{libname}.so.%{soname}' Makefile; then + : soname have changed + grep soname Makefile + exit 1 +fi + +# Fix pkgconfig file +sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i %{libname}.pc + +# Honours default RPM build options and library path +sed -e 's:-O3 -Wall:%{optflags}:' \ + -e '/^LIBRARY_REL/s:lib:%{_lib}:' \ + -i Makefile + +%build +# parallel build is not supported +make -j1 + + +%install +make install DESTDIR=%{buildroot} + +# Drop static library +rm %{buildroot}%{_libdir}/%{libname}.a + +# Create link to soname, see Makefile for value +mv %{buildroot}%{_libdir}/%{libname}.so %{buildroot}%{_libdir}/%{libname}.so.%{soname} +ln -s %{libname}.so.%{soname} %{buildroot}%{_libdir}/%{libname}.so + +# pkgconfig file +install -Dpm 644 %{libname}.pc %{buildroot}%{_libdir}/pkgconfig/%{libname}.pc + +# Fix perms +chmod -x %{buildroot}%{_includedir}/%{name}.h + + +%check +make test + + +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig + + +%files +%{_bindir}/%{name} + +%files -n %{libname} +%{!?_licensedir:%global license %%doc} +%license LICENSE +%{_libdir}/%{libname}.so.%{soname} + +%files -n %{libname}-devel +%doc *md +%{_includedir}/%{name}.h +%{_libdir}/%{libname}.so +%{_libdir}/pkgconfig/%{libname}.pc + + +%changelog +* Wed Oct 18 2017 Remi Collet - 20161029-1 +- initial package diff --git a/sources b/sources new file mode 100644 index 0000000..4a13063 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (phc-winner-argon2-20161029-1c4fc41.tar.gz) = 1da8241d66f00efce025119bf914cd0bfd3754f6b4e97eedab083ff268a6165e722305b798399815c78a5a82fb728c0e0710e7ee0d5ff1b4bb59d1e9b577beb1 From 91aa67dbd941e15942040bb4583f8e418b1e8cc8 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 16 Nov 2017 13:38:54 +0100 Subject: [PATCH 03/19] Do not use -march=native in build, use system flags (rh #1512845). --- argon2.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/argon2.spec b/argon2.spec index e385f85..b94bfe5 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/System Summary: The password-hashing tools @@ -85,9 +85,11 @@ fi # Fix pkgconfig file sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i %{libname}.pc -# Honours default RPM build options and library path +# Honours default RPM build options and library path, do not use -march=native sed -e 's:-O3 -Wall:%{optflags}:' \ -e '/^LIBRARY_REL/s:lib:%{_lib}:' \ + -e 's:-march=\$(OPTTARGET) :${CFLAGS} :' \ + -e 's:CFLAGS += -march=\$(OPTTARGET)::' \ -i Makefile %build @@ -136,5 +138,8 @@ make test %changelog +* Thu Nov 16 2017 Milan Broz - 20161029-2 +- Do not use -march=native in build, use system flags (rh #1512845). + * Wed Oct 18 2017 Remi Collet - 20161029-1 - initial package From e7a07f38312968bee0aca1e6bcf6a9feb1f352e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 02:47:44 +0000 Subject: [PATCH 04/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argon2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argon2.spec b/argon2.spec index b94bfe5..a18175a 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/System Summary: The password-hashing tools @@ -138,6 +138,9 @@ make test %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 20161029-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Nov 16 2017 Milan Broz - 20161029-2 - Do not use -march=native in build, use system flags (rh #1512845). From 9cffd5714bd680ec8d017fe2accb6924a0a45a10 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Feb 2018 08:35:57 +0100 Subject: [PATCH 05/19] drop ldconfig scriptlets --- argon2.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/argon2.spec b/argon2.spec index a18175a..e37657d 100644 --- a/argon2.spec +++ b/argon2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for argon2 # -# Copyright (c) 2017 Remi Collet +# Copyright (c) 2017-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/System Summary: The password-hashing tools @@ -118,10 +118,6 @@ chmod -x %{buildroot}%{_includedir}/%{name}.h make test -%post -n %{libname} -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig - - %files %{_bindir}/%{name} @@ -138,6 +134,9 @@ make test %changelog +* Thu Feb 15 2018 Remi Collet - 20161029-4 +- drop ldconfig scriptlets + * Wed Feb 07 2018 Fedora Release Engineering - 20161029-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From a65cc9516cbcd51498b102bdd32f6d11168f6212 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Mar 2018 14:15:15 +0100 Subject: [PATCH 06/19] honours all build flags #1558128 --- argon2.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/argon2.spec b/argon2.spec index e37657d..335627e 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/System Summary: The password-hashing tools @@ -86,7 +86,8 @@ fi sed -e 's:lib/@HOST_MULTIARCH@:%{_lib}:;s/@UPSTREAM_VER@/%{version}/' -i %{libname}.pc # Honours default RPM build options and library path, do not use -march=native -sed -e 's:-O3 -Wall:%{optflags}:' \ +sed -e '/^CFLAGS/s:^CFLAGS:LDFLAGS=%{build_ldflags}\nCFLAGS:' \ + -e 's:-O3 -Wall:%{optflags}:' \ -e '/^LIBRARY_REL/s:lib:%{_lib}:' \ -e 's:-march=\$(OPTTARGET) :${CFLAGS} :' \ -e 's:CFLAGS += -march=\$(OPTTARGET)::' \ @@ -134,6 +135,9 @@ make test %changelog +* Thu Feb 15 2018 Remi Collet - 20161029-5 +- honours all build flags #1558128 + * Thu Feb 15 2018 Remi Collet - 20161029-4 - drop ldconfig scriptlets From ec055d7047a7aeb578904c97046c6855c0e76126 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:29:16 +0000 Subject: [PATCH 07/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argon2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argon2.spec b/argon2.spec index 335627e..4bca921 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/System Summary: The password-hashing tools @@ -135,6 +135,9 @@ make test %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 20161029-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 15 2018 Remi Collet - 20161029-5 - honours all build flags #1558128 From cd15aa569c61d1489df4776f3c451169bfc2fb07 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 13 Jul 2018 11:55:11 +0200 Subject: [PATCH 08/19] cleanup --- argon2.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/argon2.spec b/argon2.spec index 4bca921..14ff5a4 100644 --- a/argon2.spec +++ b/argon2.spec @@ -19,13 +19,13 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 6%{?dist} -Group: Applications/System Summary: The password-hashing tools License: Public Domain or ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz +BuildRequires: gcc Requires: %{libname}%{?_isa} = %{version}-%{release} @@ -54,7 +54,6 @@ Argon2 has three variants: Argon2i, Argon2d, and Argon2id. %package -n %{libname} -Group: System Environment/Libraries Summary: The password-hashing library %description -n %{libname} @@ -64,7 +63,6 @@ for credential storage, key derivation, or other applications. %package -n %{libname}-devel -Group: Development/Libraries Summary: Development files for %{libname} Requires: %{libname}%{?_isa} = %{version}-%{release} From 802a10b635b29cfdf42b9b3200d9f3abc17cbd3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:42:58 +0000 Subject: [PATCH 09/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argon2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argon2.spec b/argon2.spec index 14ff5a4..f54d5ce 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 6%{?dist} +Release: 7%{?dist} Summary: The password-hashing tools License: Public Domain or ASL 2.0 @@ -133,6 +133,9 @@ make test %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 20161029-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 20161029-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 631def3b65f2ef1934fff47e33b406f18fccbd09 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 18 Mar 2019 12:31:13 +0100 Subject: [PATCH 10/19] Update to version 20171227 (rh #1560753). Fix thread crash when out of memory (rh #1688752). --- .gitignore | 1 + ...licit_bzero-on-recent-glibc-versions.patch | 51 +++++++++++++++++++ ...-running-threads-if-a-thread-creatio.patch | 42 +++++++++++++++ argon2.spec | 30 +++++++---- sources | 2 +- 5 files changed, 116 insertions(+), 10 deletions(-) create mode 100644 argon2-Use-explicit_bzero-on-recent-glibc-versions.patch create mode 100644 argon2-Wait-for-already-running-threads-if-a-thread-creatio.patch diff --git a/.gitignore b/.gitignore index 12fd223..347c4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /phc-winner-argon2-20161029-1c4fc41.tar.gz +/phc-winner-argon2-20171227-670229c.tar.gz diff --git a/argon2-Use-explicit_bzero-on-recent-glibc-versions.patch b/argon2-Use-explicit_bzero-on-recent-glibc-versions.patch new file mode 100644 index 0000000..e6265da --- /dev/null +++ b/argon2-Use-explicit_bzero-on-recent-glibc-versions.patch @@ -0,0 +1,51 @@ +From fea3943adadf6527d1e839a2953e9591896e628d Mon Sep 17 00:00:00 2001 +From: "Maciej S. Szmigiero" +Date: Tue, 5 Mar 2019 14:30:22 +0100 +Subject: [PATCH] Use explicit_bzero() on recent glibc versions + +glibc 2.25+ has explicit_bzero(), so we can use it to securely wipe memory +instead of hacking our own memset-based replacement, just like we already +do on OpenBSD. +--- + src/core.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/core.c b/src/core.c +index 8781852..8361175 100644 +--- a/src/core.c ++++ b/src/core.c +@@ -25,6 +25,9 @@ + #endif + #define VC_GE_2005(version) (version >= 1400) + ++/* for explicit_bzero() on glibc */ ++#define _DEFAULT_SOURCE ++ + #include + #include + #include +@@ -120,12 +123,20 @@ void free_memory(const argon2_context *context, uint8_t *memory, + } + } + ++#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; +-- +2.20.1 + diff --git a/argon2-Wait-for-already-running-threads-if-a-thread-creatio.patch b/argon2-Wait-for-already-running-threads-if-a-thread-creatio.patch new file mode 100644 index 0000000..d814fc6 --- /dev/null +++ b/argon2-Wait-for-already-running-threads-if-a-thread-creatio.patch @@ -0,0 +1,42 @@ +From cfa4385e728116989ad88b4be7c23b4868422778 Mon Sep 17 00:00:00 2001 +From: Milan Broz +Date: Mon, 11 Mar 2019 21:21:57 +0100 +Subject: [PATCH] Wait for already running threads if a thread creation + failed. + +On memory-constrained systems (like cgroups limited processes) +thread creation often fails. + +The code needs to wait for already running threads on error path; +otherwise these threads can access deallocated memory +(and cause a segfault or another crash). +--- + src/core.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/core.c b/src/core.c +index 8361175..65f0537 100644 +--- a/src/core.c ++++ b/src/core.c +@@ -310,7 +310,7 @@ static int fill_memory_blocks_mt(argon2_instance_t *instance) { + + 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) { +@@ -335,6 +335,9 @@ static int fill_memory_blocks_mt(argon2_instance_t *instance) { + 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; + } +-- +2.20.1 + diff --git a/argon2.spec b/argon2.spec index f54d5ce..7a576f6 100644 --- a/argon2.spec +++ b/argon2.spec @@ -7,27 +7,31 @@ # Please, preserve the changelog entries # %global libname libargon2 -%global gh_commit 1c4fc41f81f358283755eea88d4ecd05e43b7fd3 +%global gh_commit 670229c849b9fe882583688b74eb7dfdc846f9f6 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner P-H-C %global gh_project phc-winner-argon2 -%global soname 0 +%global soname 1 -%global upstream_version 20161029 +%global upstream_version 20171227 #global upstream_prever RC1 Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 7%{?dist} +Release: 1%{?dist} Summary: The password-hashing tools License: Public Domain or ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tar.gz +Patch0: argon2-Use-explicit_bzero-on-recent-glibc-versions.patch +Patch1: argon2-Wait-for-already-running-threads-if-a-thread-creatio.patch BuildRequires: gcc Requires: %{libname}%{?_isa} = %{version}-%{release} +# TODO remove this - Hack to not break buildroot +BuildRequires: libargon2 %description Argon2 is a password-hashing function that summarizes the state of the art @@ -73,8 +77,10 @@ developing applications that use %{libname}. %prep %setup -qn %{gh_project}-%{gh_commit} +%patch0 -p1 +%patch1 -p1 -if ! grep -q 'soname,%{libname}.so.%{soname}' Makefile; then +if ! grep -q 'ABI_VERSION = %{soname}' Makefile; then : soname have changed grep soname Makefile exit 1 @@ -102,16 +108,14 @@ make install DESTDIR=%{buildroot} # Drop static library rm %{buildroot}%{_libdir}/%{libname}.a -# Create link to soname, see Makefile for value -mv %{buildroot}%{_libdir}/%{libname}.so %{buildroot}%{_libdir}/%{libname}.so.%{soname} -ln -s %{libname}.so.%{soname} %{buildroot}%{_libdir}/%{libname}.so - # pkgconfig file install -Dpm 644 %{libname}.pc %{buildroot}%{_libdir}/pkgconfig/%{libname}.pc # Fix perms chmod -x %{buildroot}%{_includedir}/%{name}.h +# TODO remove this - Hack to not break buildroot +cp -p %{_libdir}/libargon2.so.0 %{buildroot}%{_libdir} %check make test @@ -125,6 +129,9 @@ make test %license LICENSE %{_libdir}/%{libname}.so.%{soname} +# TODO remove this - Hack to not break buildroot +%{_libdir}/libargon2.so.0 + %files -n %{libname}-devel %doc *md %{_includedir}/%{name}.h @@ -133,6 +140,11 @@ make test %changelog +* Mon Mar 18 2019 Milan Broz - 20171227-1 +- Update to version 20171227 (soname increase). +- Temporarily keep libargon2.so.0. +- Fix a crash if running under memory pressure. + * Thu Jan 31 2019 Fedora Release Engineering - 20161029-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 4a13063..9c794cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phc-winner-argon2-20161029-1c4fc41.tar.gz) = 1da8241d66f00efce025119bf914cd0bfd3754f6b4e97eedab083ff268a6165e722305b798399815c78a5a82fb728c0e0710e7ee0d5ff1b4bb59d1e9b577beb1 +SHA512 (phc-winner-argon2-20171227-670229c.tar.gz) = 005c6bba5a3fa0470389a667c4d9ee1cd6401a981330cc72c84d87d9563159ce3f600f65204baf999aa6350dfbecc7c036946347306e089154ef09b9fb65494e From 390e54491e5fd598f7ecc522f1cbc3c444d260ed Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Mon, 18 Mar 2019 15:37:42 +0100 Subject: [PATCH 11/19] Rebuilt to remove old library. --- argon2.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/argon2.spec b/argon2.spec index 7a576f6..af9fd46 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The password-hashing tools License: Public Domain or ASL 2.0 @@ -30,8 +30,6 @@ Patch1: argon2-Wait-for-already-running-threads-if-a-thread-creatio.patch BuildRequires: gcc Requires: %{libname}%{?_isa} = %{version}-%{release} -# TODO remove this - Hack to not break buildroot -BuildRequires: libargon2 %description Argon2 is a password-hashing function that summarizes the state of the art @@ -114,8 +112,6 @@ install -Dpm 644 %{libname}.pc %{buildroot}%{_libdir}/pkgconfig/%{libname}.pc # Fix perms chmod -x %{buildroot}%{_includedir}/%{name}.h -# TODO remove this - Hack to not break buildroot -cp -p %{_libdir}/libargon2.so.0 %{buildroot}%{_libdir} %check make test @@ -129,8 +125,6 @@ make test %license LICENSE %{_libdir}/%{libname}.so.%{soname} -# TODO remove this - Hack to not break buildroot -%{_libdir}/libargon2.so.0 %files -n %{libname}-devel %doc *md @@ -140,6 +134,9 @@ make test %changelog +* Mon Mar 18 2019 Milan Broz - 20171227-2 +- Rebuilt to remove old library. + * Mon Mar 18 2019 Milan Broz - 20171227-1 - Update to version 20171227 (soname increase). - Temporarily keep libargon2.so.0. From 41efe5e90b6ab26d7eb5df3983de40d9a28c7eac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 18:20:19 +0000 Subject: [PATCH 12/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argon2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argon2.spec b/argon2.spec index af9fd46..0c5ba5b 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The password-hashing tools License: Public Domain or ASL 2.0 @@ -134,6 +134,9 @@ make test %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 20171227-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Mar 18 2019 Milan Broz - 20171227-2 - Rebuilt to remove old library. From 7a438f7e33236fa59020371c0df19c5df7973f60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:58:45 +0000 Subject: [PATCH 13/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argon2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argon2.spec b/argon2.spec index 0c5ba5b..d9bdce3 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 4%{?dist} Summary: The password-hashing tools License: Public Domain or ASL 2.0 @@ -134,6 +134,9 @@ make test %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 20171227-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 20171227-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 9577b4ba020cc618929b3391b452e3f7951aa95e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:21:36 +0000 Subject: [PATCH 14/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argon2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argon2.spec b/argon2.spec index d9bdce3..b866aaa 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 4%{?dist} +Release: 5%{?dist} Summary: The password-hashing tools License: Public Domain or ASL 2.0 @@ -134,6 +134,9 @@ make test %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 20171227-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 20171227-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 66c56eb3e4c7fc1f159db0df9e3d30a43bebbe66 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 16 Dec 2020 23:35:50 +0000 Subject: [PATCH 15/19] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- argon2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/argon2.spec b/argon2.spec index b866aaa..94a2e1a 100644 --- a/argon2.spec +++ b/argon2.spec @@ -28,6 +28,7 @@ Patch0: argon2-Use-explicit_bzero-on-recent-glibc-versions.patch Patch1: argon2-Wait-for-already-running-threads-if-a-thread-creatio.patch BuildRequires: gcc +BuildRequires: make Requires: %{libname}%{?_isa} = %{version}-%{release} From 901f02f4455b4f0b86cbc9b34322212c39b2e513 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:24:14 +0000 Subject: [PATCH 16/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argon2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argon2.spec b/argon2.spec index 94a2e1a..7eb2926 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 5%{?dist} +Release: 6%{?dist} Summary: The password-hashing tools License: Public Domain or ASL 2.0 @@ -135,6 +135,9 @@ make test %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 20171227-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 20171227-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9ccd4e8bb3c646c961fb63305e0a8c0b33cab87e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:52:37 +0000 Subject: [PATCH 18/19] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- argon2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/argon2.spec b/argon2.spec index 7eb2926..0ebebdb 100644 --- a/argon2.spec +++ b/argon2.spec @@ -18,7 +18,7 @@ Name: argon2 Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 6%{?dist} +Release: 7%{?dist} Summary: The password-hashing tools License: Public Domain or ASL 2.0 @@ -135,6 +135,9 @@ make test %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 20171227-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 20171227-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 72fc3b734e706658c864de1df718fc8af9583fac Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 19:11:58 +0300 Subject: [PATCH 19/19] Remove unnecessary files --- README.md | 3 --- sources | 1 - 2 files changed, 4 deletions(-) delete mode 100644 README.md delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index 6537591..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# argon2 - -The password-hashing tools \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 9c794cd..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (phc-winner-argon2-20171227-670229c.tar.gz) = 005c6bba5a3fa0470389a667c4d9ee1cd6401a981330cc72c84d87d9563159ce3f600f65204baf999aa6350dfbecc7c036946347306e089154ef09b9fb65494e