commit: 6b0b174f97ff9dd444e90defa5e12611550f9158 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Tue Feb 12 16:42:08 2019 +0000 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> CommitDate: Wed Feb 13 11:02:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b0b174f
net-wireless/aircrack-ng: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/11034 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Alon Bar-Lev <alonbl <AT> gentoo.org> .../aircrack-ng-1.2-no-force-stack-protector.patch | 50 ---------------------- .../files/aircrack-ng-1.2_rc4-openssl.patch | 49 --------------------- 2 files changed, 99 deletions(-) diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch deleted file mode 100644 index d4688b84d2e..00000000000 --- a/net-wireless/aircrack-ng/files/aircrack-ng-1.2-no-force-stack-protector.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 58fe40daf3e082d9e63d689d795a3bbecf72fedb Mon Sep 17 00:00:00 2001 -From: Joseph Benden <j...@benden.us> -Date: Mon, 16 Apr 2018 11:26:23 -0700 -Subject: [PATCH] autotools: The flag --without-opt should skip stack protector - flags. (#1864) - ---- - build/m4/aircrack_ng_compiler.m4 | 28 ++++++++++++++++------------ - 1 file changed, 16 insertions(+), 12 deletions(-) - -diff --git a/build/m4/aircrack_ng_compiler.m4 b/build/m4/aircrack_ng_compiler.m4 -index 0fb19726..8a973dbf 100644 ---- a/build/m4/aircrack_ng_compiler.m4 -+++ b/build/m4/aircrack_ng_compiler.m4 -@@ -108,19 +108,23 @@ case "$ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor" in - CYGWIN*|MSYS*|cygwin*|msys*) - ;; - *) -- AS_IF([test "x$gcc_over49" = "xno"], [ -- AS_IF([test "x$gcc_over41" = "xyes"], [ -- AX_CHECK_COMPILE_FLAG([-fstack-protector], [ -- AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags]) -- ]) -- ], []) -- ], []) -+ case $with_opt in -+ yes | "") -+ AS_IF([test "x$gcc_over49" = "xno"], [ -+ AS_IF([test "x$gcc_over41" = "xyes"], [ -+ AX_CHECK_COMPILE_FLAG([-fstack-protector], [ -+ AX_APPEND_FLAG(-fstack-protector, [opt_[]_AC_LANG_ABBREV[]flags]) -+ ]) -+ ], []) -+ ], []) - -- AS_IF([test "x$gcc_over49" = "xyes"], [ -- AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ -- AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags]) -- ]) -- ], []) -+ AS_IF([test "x$gcc_over49" = "xyes"], [ -+ AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [ -+ AX_APPEND_FLAG(-fstack-protector-strong, [opt_[]_AC_LANG_ABBREV[]flags]) -+ ]) -+ ], []) -+ ;; -+ esac - ;; - esac - ;; diff --git a/net-wireless/aircrack-ng/files/aircrack-ng-1.2_rc4-openssl.patch b/net-wireless/aircrack-ng/files/aircrack-ng-1.2_rc4-openssl.patch deleted file mode 100644 index a83f622d3a6..00000000000 --- a/net-wireless/aircrack-ng/files/aircrack-ng-1.2_rc4-openssl.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: a/src/crypto.c -=================================================================== ---- a/src/crypto.c (revision 2881) -+++ b/src/crypto.c (revision 2882) -@@ -288,7 +288,15 @@ - void calc_mic (struct AP_info *ap, unsigned char pmk[32], unsigned char ptk[80], unsigned char mic[20]) { - int i; - unsigned char pke[100]; -+ #if defined(USE_GCRYPT) || OPENSSL_VERSION_NUMBER < 0x10100000L -+ #define HMAC_USE_NO_PTR -+ #endif -+ -+ #ifdef HMAC_USE_NO_PTR - HMAC_CTX ctx; -+ #else -+ HMAC_CTX * ctx; -+ #endif - - memcpy( pke, "Pairwise key expansion", 23 ); - -@@ -314,6 +322,7 @@ - memcpy( pke + 67, ap->wpa.snonce, 32 ); - } - -+ #ifdef HMAC_USE_NO_PTR - HMAC_CTX_init(&ctx); - HMAC_Init_ex(&ctx, pmk, 32, EVP_sha1(), NULL); - for(i = 0; i < 4; i++ ) -@@ -325,6 +334,20 @@ - HMAC_Final(&ctx, ptk + i*20, NULL); - } - HMAC_CTX_cleanup(&ctx); -+ #else -+ ctx = HMAC_CTX_new(); -+ HMAC_Init_ex(ctx, pmk, 32, EVP_sha1(), NULL); -+ for(i = 0; i < 4; i++ ) -+ { -+ pke[99] = i; -+ //HMAC(EVP_sha1(), values[0], 32, pke, 100, ptk + i * 20, NULL); -+ HMAC_Init_ex(ctx, 0, 0, 0, 0); -+ HMAC_Update(ctx, pke, 100); -+ HMAC_Final(ctx, ptk + i*20, NULL); -+ } -+ HMAC_CTX_free(ctx); -+ #endif -+ #undef HMAC_USE_NO_PTR - - if( ap->wpa.keyver == 1 ) - {
