From 60bb0d63290c585e87938575c7fa34fa21d2dce3 Mon Sep 17 00:00:00 2001 From: philsmd Date: Wed, 10 Jun 2020 11:45:31 +0200 Subject: [PATCH 1/3] tests: add php to requirements --- tools/install_modules.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/install_modules.sh b/tools/install_modules.sh index 804960f82..b2a4e71a0 100755 --- a/tools/install_modules.sh +++ b/tools/install_modules.sh @@ -66,6 +66,15 @@ pip2 uninstall -y pycryptodome ERRORS=$((ERRORS+$?)) +php --version > /dev/null 2> /dev/null + +if [ "$?" -ne 0 ] +then + echo '[ ERROR ] php must be installed for some unit tests' + + ERRORS=$((ERRORS+1)) +fi + echo if [ $ERRORS -eq 0 ]; then echo '[ OK ] All commands were successful' From 96416d5dfb87ac0972ad013d3b687b32bdf853a6 Mon Sep 17 00:00:00 2001 From: philsmd Date: Wed, 10 Jun 2020 11:55:17 +0200 Subject: [PATCH 2/3] tests: update perl module requirements --- tools/install_modules.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/install_modules.sh b/tools/install_modules.sh index 804960f82..26605c7d3 100755 --- a/tools/install_modules.sh +++ b/tools/install_modules.sh @@ -23,6 +23,7 @@ cpan install Authen::Passphrase::LANManager \ Crypt::ECB \ Crypt::Eksblowfish::Bcrypt \ Crypt::GCrypt \ + Crypt::Mode::CBC \ Crypt::Mode::ECB \ Crypt::MySQL \ Crypt::OpenSSH::ChachaPoly \ @@ -50,11 +51,13 @@ cpan install Authen::Passphrase::LANManager \ Digest::SHA1 \ Digest::SHA3 \ Digest::SipHash \ + Encode \ JSON \ MIME::Base32 \ MIME::Base64 \ Net::DNS::RR::NSEC3 \ Net::DNS::SEC \ + POSIX \ Text::Iconv \ ; From 9201909cd252a3c6d43955635bb04e6409725a2e Mon Sep 17 00:00:00 2001 From: philsmd Date: Wed, 10 Jun 2020 12:02:33 +0200 Subject: [PATCH 3/3] perl scripts: add license and chmod +x --- tools/benchmark_deep.pl | 7 ++++++- .../GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl | 7 ++++++- .../GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl | 7 ++++++- .../GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl | 7 ++++++- .../GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl | 7 ++++++- .../GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl | 7 ++++++- .../GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl | 7 ++++++- .../GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl | 7 ++++++- .../GEN_NV_switch_buffer_by_offset_1x64_be_S.pl | 7 ++++++- .../GEN_NV_switch_buffer_by_offset_1x64_le_S.pl | 7 ++++++- .../GEN_NV_switch_buffer_by_offset_4x4_be_S.pl | 7 ++++++- .../GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl | 7 ++++++- .../GEN_NV_switch_buffer_by_offset_4x4_le_S.pl | 7 ++++++- .../GEN_NV_switch_buffer_by_offset_8x4_be_S.pl | 7 ++++++- .../GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl | 7 ++++++- tools/code_generators/GEN_truncate_block_16x4_be.pl | 7 ++++++- tools/code_generators/GEN_truncate_block_16x4_le.pl | 7 ++++++- tools/code_generators/GEN_truncate_block_4x4_be.pl | 7 ++++++- tools/code_generators/GEN_truncate_block_4x4_le.pl | 7 ++++++- tools/securenotes2hashcat.pl | 0 20 files changed, 114 insertions(+), 19 deletions(-) mode change 100644 => 100755 tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl mode change 100644 => 100755 tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl mode change 100644 => 100755 tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_le_S.pl mode change 100644 => 100755 tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_le_S.pl mode change 100644 => 100755 tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl mode change 100644 => 100755 tools/code_generators/GEN_truncate_block_16x4_be.pl mode change 100644 => 100755 tools/code_generators/GEN_truncate_block_16x4_le.pl mode change 100644 => 100755 tools/code_generators/GEN_truncate_block_4x4_be.pl mode change 100644 => 100755 tools/code_generators/GEN_truncate_block_4x4_le.pl mode change 100644 => 100755 tools/securenotes2hashcat.pl diff --git a/tools/benchmark_deep.pl b/tools/benchmark_deep.pl index 4b6f629fe..a7a2124d0 100755 --- a/tools/benchmark_deep.pl +++ b/tools/benchmark_deep.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl old mode 100644 new mode 100755 index 18867c567..f497021d2 --- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl +++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl old mode 100644 new mode 100755 index 26a73ba5e..16b735557 --- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl +++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_1x64_le_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl old mode 100644 new mode 100755 index 25acf22f0..e73e10cbb --- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl +++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl old mode 100644 new mode 100755 index cbaa406fe..4e898457f --- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl +++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_carry_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl old mode 100644 new mode 100755 index 310634f6b..aadb6a2c1 --- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl +++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_4x4_le_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl old mode 100644 new mode 100755 index 404d3eb0e..11e3d22ac --- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl +++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl old mode 100644 new mode 100755 index 931caf5c6..6c059d564 --- a/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl +++ b/tools/code_generators/GEN_AMD_switch_buffer_by_offset_8x4_carry_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_be_S.pl old mode 100644 new mode 100755 index 2719267fd..784dd80a8 --- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_be_S.pl +++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_le_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_le_S.pl old mode 100644 new mode 100755 index f8a87f7d5..2b4d40ee7 --- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_le_S.pl +++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_1x64_le_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_be_S.pl old mode 100644 new mode 100755 index c2c95751f..bf4052848 --- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_be_S.pl +++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl old mode 100644 new mode 100755 index 2f1e87497..2993fc697 --- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl +++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_carry_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_le_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_le_S.pl old mode 100644 new mode 100755 index 0f0f62809..e1ba4b6e6 --- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_le_S.pl +++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_4x4_le_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_be_S.pl old mode 100644 new mode 100755 index ea67607ab..6f3c0336f --- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_be_S.pl +++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl b/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl old mode 100644 new mode 100755 index 2ac665806..15fd4c1e7 --- a/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl +++ b/tools/code_generators/GEN_NV_switch_buffer_by_offset_8x4_carry_be_S.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_truncate_block_16x4_be.pl b/tools/code_generators/GEN_truncate_block_16x4_be.pl old mode 100644 new mode 100755 index 41427e754..59363850b --- a/tools/code_generators/GEN_truncate_block_16x4_be.pl +++ b/tools/code_generators/GEN_truncate_block_16x4_be.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_truncate_block_16x4_le.pl b/tools/code_generators/GEN_truncate_block_16x4_le.pl old mode 100644 new mode 100755 index ce17f8bcc..5c19219f1 --- a/tools/code_generators/GEN_truncate_block_16x4_le.pl +++ b/tools/code_generators/GEN_truncate_block_16x4_le.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_truncate_block_4x4_be.pl b/tools/code_generators/GEN_truncate_block_4x4_be.pl old mode 100644 new mode 100755 index e5b017841..c92c32bf1 --- a/tools/code_generators/GEN_truncate_block_4x4_be.pl +++ b/tools/code_generators/GEN_truncate_block_4x4_be.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/code_generators/GEN_truncate_block_4x4_le.pl b/tools/code_generators/GEN_truncate_block_4x4_le.pl old mode 100644 new mode 100755 index 292120770..11e1430bf --- a/tools/code_generators/GEN_truncate_block_4x4_le.pl +++ b/tools/code_generators/GEN_truncate_block_4x4_le.pl @@ -1,4 +1,9 @@ -#!/usr/bin/perl +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## use strict; use warnings; diff --git a/tools/securenotes2hashcat.pl b/tools/securenotes2hashcat.pl old mode 100644 new mode 100755