Refresh patches

7 files changed, 44 insertions, 169 deletions

diff --git a/debian/patches/0001-Fix-buffer-overflow-in-icastats_test.c.patch b/debian/patches/0001-Fix-buffer-overflow-in-icastats_test.c.patch
deleted file mode 100644
index 9dda4ee..0000000
--- a/debian/patches/0001-Fix-buffer-overflow-in-icastats_test.c.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 61e51e580f107c43f7136e94eae0783612cfc003 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <xnox@ubuntu.com>
-Date: Wed, 27 Jan 2016 22:07:47 +0000
-Subject: [PATCH 1/5] Fix buffer overflow in icastats_test.c
-
----
- src/tests/icastats_test.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/tests/icastats_test.c b/src/tests/icastats_test.c
-index c207408..a2110c4 100644
---- a/src/tests/icastats_test.c
-+++ b/src/tests/icastats_test.c
-@@ -222,7 +222,7 @@ int check_hw(int algo_id)
-  **/
- void check_icastats(int algo_id, char *stat)
- {
--	char awk[80];
-+	char awk[255];
- 	FILE *fp;
- 	int i, hw, enc, dec;
- 
--- 
-2.7.0.rc3
-
diff --git a/debian/patches/0001-fixed-for-loop-range-in-func-s390_inintialize_functi.patch b/debian/patches/0001-fixed-for-loop-range-in-func-s390_inintialize_functi.patch
deleted file mode 100644
index de25a33..0000000
--- a/debian/patches/0001-fixed-for-loop-range-in-func-s390_inintialize_functi.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 621459f473a1a682ab1c0cdfc92303a7ad0aee19 Mon Sep 17 00:00:00 2001
-From: Patrick Steuer <patrick.steuer@de.ibm.com>
-Date: Mon, 11 Jan 2016 13:37:12 +0100
-Subject: [PATCH] fixed for-loop (range) in func s390_inintialize_functionlist
-
-Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
----
- src/s390_crypto.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libica/src/s390_crypto.c
-===================================================================
---- libica.orig/src/s390_crypto.c
-+++ libica/src/s390_crypto.c
-@@ -239,7 +239,7 @@ int s390_initialize_functionlist() {
- 
-   unsigned int list_len = (sizeof(icaList)/sizeof(libica_func_list_element_int)), x;
- 
--  for (x=0; x<=list_len; x++) {
-+  for (x=0; x<list_len; x++) {
-   	switch ((int)icaList[x].type) {
- 	case KIMD:
- 		icaList[x].flags = icaList[x].flags | 
diff --git a/debian/patches/0002-Correctly-link-with-pthread-on-linux.patch b/debian/patches/0002-Correctly-link-with-pthread-on-linux.patch
deleted file mode 100644
index 57efec8..0000000
--- a/debian/patches/0002-Correctly-link-with-pthread-on-linux.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 88b9a007844978100d39063fbd4ac6d8654f4ef5 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <xnox@ubuntu.com>
-Date: Wed, 27 Jan 2016 22:08:43 +0000
-Subject: [PATCH 2/5] Correctly link with pthread on linux.
-
----
- configure.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 38f1ea6..2feb1c0 100644
---- a/configure.in
-+++ b/configure.in
-@@ -23,7 +23,7 @@ AC_PROG_LIBTOOL
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([fcntl.h memory.h stdlib.h string.h strings.h sys/ioctl.h unistd.h \
--		  errno.h stdio.h pthread.h semaphore.h linux/types.h sys/ioctl.h])
-+		  errno.h stdio.h semaphore.h linux/types.h sys/ioctl.h])
- case "$target" in
-      *s390*)
-           AC_CHECK_HEADERS([openssl/bn.h openssl/rsa.h openssl/rand.h \
-@@ -52,6 +52,8 @@ AC_FUNC_STAT
- AC_CHECK_FUNCS([bzero memset])
- 
- CFLAGS="$cmdline_CFLAGS"
-+AX_PTHREAD
-+CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
- 
- case $target in
-      *s390x*)
--- 
-2.7.0.rc3
-
diff --git a/debian/patches/0003-Fix-linking-order-in-the-tests.patch b/debian/patches/0003-Fix-linking-order-in-the-tests.patch
deleted file mode 100644
index bdd2d7e..0000000
--- a/debian/patches/0003-Fix-linking-order-in-the-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9073d46565d13345718738a6eda3357e11ef45e9 Mon Sep 17 00:00:00 2001
-From: Dimitri John Ledkov <xnox@ubuntu.com>
-Date: Wed, 27 Jan 2016 22:11:22 +0000
-Subject: [PATCH 3/5] Fix linking order in the tests.
-
----
- src/tests/Makefile.am                 | 2 +-
- src/tests/libica_sha_test/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
-index 0f510c1..f941c49 100644
---- a/src/tests/Makefile.am
-+++ b/src/tests/Makefile.am
-@@ -29,7 +29,7 @@ all: $(TARGETS)
- 
- # Every target is created from a single .c file.
- %: %.c
--	gcc $(OPTS) $(LIBS) $(INCLUDE) -lica -lcrypto -o $@ $^
-+	gcc $(OPTS) -o $@ $^ $(LIBS) $(INCLUDE) -lica -lcrypto
- 
- clean:
- 	rm -f $(TARGETS)
-diff --git a/src/tests/libica_sha_test/Makefile.am b/src/tests/libica_sha_test/Makefile.am
-index 34bdf91..b6b4fc4 100644
---- a/src/tests/libica_sha_test/Makefile.am
-+++ b/src/tests/libica_sha_test/Makefile.am
-@@ -16,7 +16,7 @@ FILES = libica_sha_test.c~ \
- 	include/critical_error.h~
- 
- all:
--	$(CC) $(OPTS) $(LIBS) $(INCLUDE) -lica -lcrypto -o libica_sha_test $(SOURCES)
-+	$(CC) $(OPTS) -o libica_sha_test $(SOURCES) $(LIBS) $(INCLUDE) -lica -lcrypto
- 
- clean:
- 	rm -f libica_sha_test
--- 
-2.7.0.rc3
-
diff --git a/debian/patches/0005-ubuntu-skip-generating-suite.out-report-to-stdout.patch b/debian/patches/0005-ubuntu-skip-generating-suite.out-report-to-stdout.patch
index 8ba001e..f01d8aa 100644
--- a/debian/patches/0005-ubuntu-skip-generating-suite.out-report-to-stdout.patch
+++ b/debian/patches/0005-ubuntu-skip-generating-suite.out-report-to-stdout.patch
@@ -7,11 +7,11 @@ Subject: [PATCH 5/5] ubuntu: skip generating suite.out, report to stdout.
  src/tests/suite.run | 70 ++++++++++++++++++++++++++---------------------------
  1 file changed, 35 insertions(+), 35 deletions(-)
 
-diff --git a/src/tests/suite.run b/src/tests/suite.run
-index c53ac31..e45d966 100755
---- a/src/tests/suite.run
-+++ b/src/tests/suite.run
-@@ -9,49 +9,49 @@ silent=${1}
+Index: libica/src/tests/suite.run
+===================================================================
+--- libica.orig/src/tests/suite.run
++++ libica/src/tests/suite.run
+@@ -9,50 +9,50 @@ silent=${1}
  
  echo -ne 'Starting libica test suite ...\n'
  echo -ne '-------------------------------------------------- (0%)\r'
@@ -94,8 +94,7 @@ index c53ac31..e45d966 100755
 -./libica_sha_test/libica_sha_test $silent $PARMS >> ./suite.out
 +./libica_sha_test/libica_sha_test $silent $PARMS
  #./libica_sha_test/libica_sha_test 'libica_sha_test/sha_test_vectors/*'
+-./libica_drbg_test $silent >> ./suite.out
++./libica_drbg_test $silent
  echo -ne '################################################# (100%) Done\r'
  echo -ne '\n'
--- 
-2.7.0.rc3
-
diff --git a/debian/patches/series b/debian/patches/series
index 2285528..c460db0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,2 @@
-0001-Fix-buffer-overflow-in-icastats_test.c.patch
-0002-Correctly-link-with-pthread-on-linux.patch
-0003-Fix-linking-order-in-the-tests.patch
 0004-Make-test-suite-bail-out-upon-errors.patch
 0005-ubuntu-skip-generating-suite.out-report-to-stdout.patch
-0001-fixed-for-loop-range-in-func-s390_inintialize_functi.patch
diff --git a/src/tests/suite.run b/src/tests/suite.run
index effd233..a697810 100755
--- a/src/tests/suite.run
+++ b/src/tests/suite.run
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 # Libica test suite
 #
@@ -8,50 +9,50 @@ silent=${1}
 
 echo -ne 'Starting libica test suite ...\n'
 echo -ne '-------------------------------------------------- (0%)\r'
-./icastats_test $silent > ./suite.out
+./icastats_test $silent
 echo -ne '#------------------------------------------------- (2%)\r'
-./libica_3des_cbc_test $silent >> ./suite.out
-./libica_3des_cfb_test $silent >> ./suite.out
-./libica_3des_ctr_test $silent >> ./suite.out
-./libica_3des_ecb_test $silent >> ./suite.out
-./libica_3des_ofb_test $silent >> ./suite.out
+./libica_3des_cbc_test $silent
+./libica_3des_cfb_test $silent
+./libica_3des_ctr_test $silent
+./libica_3des_ecb_test $silent
+./libica_3des_ofb_test $silent
 echo -ne '#######------------------------------------------ (15%)\r'
-./libica_aes128_test $silent >> ./suite.out
-./libica_aes192_test $silent >> ./suite.out
-./libica_aes256_test $silent >> ./suite.out
-./libica_aes_cbc_test $silent >> ./suite.out
-./libica_aes_cfb_test $silent >> ./suite.out
-./libica_aes_ctr_test $silent >> ./suite.out
-./libica_aes_ecb_test $silent >> ./suite.out
-./libica_aes_gcm_test $silent >> ./suite.out
-./libica_aes_ofb_test $silent >> ./suite.out
-./libica_aes_xts_test $silent >> ./suite.out
+./libica_aes128_test $silent
+./libica_aes192_test $silent
+./libica_aes256_test $silent
+./libica_aes_cbc_test $silent
+./libica_aes_cfb_test $silent
+./libica_aes_ctr_test $silent
+./libica_aes_ecb_test $silent
+./libica_aes_gcm_test $silent
+./libica_aes_ofb_test $silent
+./libica_aes_xts_test $silent
 echo -ne '###############---------------------------------- (30%)\r'
-./libica_cbccs_test $silent >> ./suite.out
-./libica_ccm_test $silent >> ./suite.out
-./libica_cmac_test $silent >> ./suite.out
+./libica_cbccs_test $silent
+./libica_ccm_test $silent
+./libica_cmac_test $silent
 echo -ne '######################--------------------------- (45%)\r'
-./libica_des_cbc_test $silent >> ./suite.out
-./libica_des_cfb_test $silent >> ./suite.out
-./libica_des_ctr_test $silent >> ./suite.out
-./libica_des_ecb_test $silent >> ./suite.out
-./libica_des_ofb_test $silent >> ./suite.out
+./libica_des_cbc_test $silent
+./libica_des_cfb_test $silent
+./libica_des_ctr_test $silent
+./libica_des_ecb_test $silent
+./libica_des_ofb_test $silent
 echo -ne '#############################-------------------- (60%)\r'
-./libica_get_functionlist $silent >> ./suite.out
-./libica_get_version $silent >> ./suite.out
-./libica_keygen_test 512 r $silent >> ./suite.out
-./libica_keygen_test 1024 r $silent >> ./suite.out
-./libica_keygen_test 2048 r $silent >> ./suite.out
-./libica_keygen_test 4096 r $silent >> ./suite.out
-./libica_keygen_test 1234 r $silent >> ./suite.out
-./libica_rng_test $silent >> ./suite.out
+./libica_get_functionlist $silent
+./libica_get_version $silent
+./libica_keygen_test 512 r $silent
+./libica_keygen_test 1024 r $silent
+./libica_keygen_test 2048 r $silent
+./libica_keygen_test 4096 r $silent
+./libica_keygen_test 1234 r $silent
+./libica_rng_test $silent
 echo -ne '#####################################------------ (70%)\r'
-./libica_rsa_test $silent >> ./suite.out
-./libica_rsa_key_check_test $silent >> ./suite.out
+./libica_rsa_test $silent
+./libica_rsa_key_check_test $silent
 echo -ne '############################################----- (80%)\r'
 PARMS="libica_sha_test/sha_test_vectors/*"
-./libica_sha_test/libica_sha_test $silent $PARMS >> ./suite.out
+./libica_sha_test/libica_sha_test $silent $PARMS
 #./libica_sha_test/libica_sha_test 'libica_sha_test/sha_test_vectors/*'
-./libica_drbg_test $silent >> ./suite.out
+./libica_drbg_test $silent
 echo -ne '################################################# (100%) Done\r'
 echo -ne '\n'