From 009c4269bc1bc9fd894ff4fc6d4d6df7e3dea6e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Wed, 14 Nov 2018 19:35:40 +0100
Subject: [PATCH] Remove unused patches

---
 ...rypt-4.3.3-alg_sha512_make_PAD_const.patch | 27 --------------
 libxcrypt-4.3.3-gensalt_r_as_macro.patch      | 25 -------------
 ....3.3-skip_bcrypt_test_if_not_enabled.patch | 36 -------------------
 3 files changed, 88 deletions(-)
 delete mode 100644 libxcrypt-4.3.3-alg_sha512_make_PAD_const.patch
 delete mode 100644 libxcrypt-4.3.3-gensalt_r_as_macro.patch
 delete mode 100644 libxcrypt-4.3.3-skip_bcrypt_test_if_not_enabled.patch

diff --git a/libxcrypt-4.3.3-alg_sha512_make_PAD_const.patch b/libxcrypt-4.3.3-alg_sha512_make_PAD_const.patch
deleted file mode 100644
index 7626057..0000000
--- a/libxcrypt-4.3.3-alg_sha512_make_PAD_const.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5e9199f293473a0c14f836b3df8ecf6aeed1e315 Mon Sep 17 00:00:00 2001
-From: Zack Weinberg <zackw@panix.com>
-Date: Mon, 12 Nov 2018 11:17:01 -0500
-Subject: [PATCH] alg-sha512.c: Make PAD const.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This object is only ever read, not written, and the code expects it
-won’t ever change.
----
- alg-sha512.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/alg-sha512.c b/alg-sha512.c
-index 8913da3..d3e83b3 100644
---- a/alg-sha512.c
-+++ b/alg-sha512.c
-@@ -204,7 +204,7 @@ SHA512_Transform(uint64_t * state, const unsigned char block[SHA512_BLOCK_LENGTH
- 		state[i] += S[i];
- }
- 
--static unsigned char PAD[SHA512_BLOCK_LENGTH] = {
-+static const unsigned char PAD[SHA512_BLOCK_LENGTH] = {
- 	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
diff --git a/libxcrypt-4.3.3-gensalt_r_as_macro.patch b/libxcrypt-4.3.3-gensalt_r_as_macro.patch
deleted file mode 100644
index bcba175..0000000
--- a/libxcrypt-4.3.3-gensalt_r_as_macro.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: libxcrypt-4.3.3/crypt.h.in.in
-===================================================================
---- libxcrypt-4.3.3.orig/crypt.h.in.in
-+++ libxcrypt-4.3.3/crypt.h.in.in
-@@ -178,12 +178,14 @@ extern char *crypt_gensalt_rn (const cha
-                                char *__output, int __output_size)
- __THROW;
- 
--/* Identical to crypt_gensalt_rn.  Kept for code compatibility with
--   older versions (v3.1.1 and earlier) of libxcrypt.  */
--extern char *crypt_gensalt_r (const char *__prefix, unsigned long __count,
--                              const char *__rbytes, int __nrbytes,
--                              char *__output, int __output_size)
--__THROW;
-+/* Kept for code compatibility with older versions (v3.1.1 and earlier)
-+   of libxcrypt.
-+   We intentionally define a macro here, since we actually want to
-+   link compiled applications against the identical crypt_gensalt_rn
-+   function.  */
-+#ifndef IN_LIBCRYPT  /* Defined when building libxcrypt. */
-+# define crypt_gensalt_r crypt_gensalt_rn
-+#endif
- 
- /* Another thread-safe version of crypt_gensalt; the generated setting
-    string is in storage allocated by malloc, and should be deallocated
diff --git a/libxcrypt-4.3.3-skip_bcrypt_test_if_not_enabled.patch b/libxcrypt-4.3.3-skip_bcrypt_test_if_not_enabled.patch
deleted file mode 100644
index 92283d6..0000000
--- a/libxcrypt-4.3.3-skip_bcrypt_test_if_not_enabled.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 65485d7891cfe50db941ab14e864bb485a54d71c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-Date: Wed, 14 Nov 2018 11:44:08 +0100
-Subject: [PATCH] Skip test-crypt-bcrypt, if no bcrypt method was enabled.
-
----
- test-crypt-bcrypt.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/test-crypt-bcrypt.c b/test-crypt-bcrypt.c
-index 9192530..947639f 100644
---- a/test-crypt-bcrypt.c
-+++ b/test-crypt-bcrypt.c
-@@ -20,6 +20,8 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
-+#if INCLUDE_bcrypt || INCLUDE_bcrypt_a || INCLUDE_bcrypt_x || INCLUDE_bcrypt_y
-+
- static const char *tests[][3] =
- {
- #if INCLUDE_bcrypt_a
-@@ -270,3 +272,13 @@ main (void)
-   free (data);
-   return status;
- }
-+
-+#else
-+
-+int
-+main (void)
-+{
-+  return 77; /* UNSUPPORTED */
-+}
-+
-+#endif /* INCLUDE_bcrypt* */