[patch] hymn-0.8.0-metalshark.patch

hymn-0.8.0-metalshark.patch (text/plain), 3.71 KB, created by Beech Horn on 2006-03-15 09:46:08 UTC

diff -Nurp hymn-0.8.0src.orig/src/cli/cli.c hymn-0.8.0src/src/cli/cli.c
--- src/cli/cli.c	2004-07-23 21:45:51.000000000 +0000
+++ src/cli/cli.c	2006-03-15 16:37:06.721077000 +0000
@@ -23,6 +23,9 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
+/* fix warnings */
+#include <string.h>
+
 #include "config.h"
 #include "hymn.h"
 #include "filename.h"
diff -Nurp hymn-0.8.0src.orig/src/cli/Makefile.am hymn-0.8.0src/src/cli/Makefile.am
--- src/cli/Makefile.am	2004-05-09 02:22:12.000000000 +0000
+++ src/cli/Makefile.am	2006-03-15 16:38:46.301077000 +0000
@@ -1,6 +1,6 @@
 bin_PROGRAMS = hymn
 hymn_SOURCES = cli.c filename.c filename.h
-hymn_LDADD = ../hymn/libhymn.a @CLI_LDADD@
+hymn_LDADD = ../hymn/libhymn.a /usr/lib/libsysfs.a @CLI_LDADD@
 hymn_LDFLAGS = -static
 
 INCLUDES = -I@top_srcdir@/src/hymn
diff -Nurp hymn-0.8.0src.orig/src/hymn/aes.c hymn-0.8.0src/src/hymn/aes.c
--- src/hymn/aes.c	2004-05-07 23:33:54.000000000 +0000
+++ src/hymn/aes.c	2006-03-15 16:38:00.331077000 +0000
@@ -20,6 +20,9 @@
 
 #include "aes.h"
 
+/* fix warnings */
+#include <string.h>
+
 /* forward S-box */
 
 static uint32 FSb[256] =
diff -Nurp hymn-0.8.0src.orig/src/hymn/atoms.h hymn-0.8.0src/src/hymn/atoms.h
--- src/hymn/atoms.h	2004-07-22 22:16:48.000000000 +0000
+++ src/hymn/atoms.h	2006-03-15 16:35:54.641077000 +0000
@@ -19,6 +19,11 @@
 * USA.
 *****************************************************************************/
 
+/* fix warnings */
+#ifdef HAVE_STRING_H
+#   include <string.h>
+#endif
+
 /* container atoms */
 #define ATOM_ALB  UINT32_FROM_BYTES(0xa9,'a','l','b')
 #define ATOM_ART  UINT32_FROM_BYTES(0xa9,'A','R','T')
diff -Nurp hymn-0.8.0src.orig/src/hymn/drms.c hymn-0.8.0src/src/hymn/drms.c
--- src/hymn/drms.c	2005-05-18 02:27:01.000000000 +0000
+++ src/hymn/drms.c	2006-03-15 16:38:28.451077000 +0000
@@ -72,6 +72,11 @@
 #include "drms.h"
 #include "drmstables.h"
 
+/* fix warnings */
+#ifdef HAVE_STRING_H
+#   include <string.h>
+#endif
+
 /*****************************************************************************
  * aes_s: AES keys structure
  *****************************************************************************
diff -Nurp hymn-0.8.0src.orig/src/hymn/hymn.h hymn-0.8.0src/src/hymn/hymn.h
--- src/hymn/hymn.h	2005-05-18 02:27:01.000000000 +0000
+++ src/hymn/hymn.h	2006-03-15 16:36:30.061077000 +0000
@@ -57,7 +57,7 @@ static int ERR_KEY_DECRYPT = 11;
 static int ERR_COULDNT_UPGRADE = 12;
 
 /* error message array -- must keep in sync w/ hymn.h */
-static const char *ERROR_MESSAGES[13] =
+static const char *ERROR_MESSAGES[14] =
 {
     /*SUCCESS*/                    "Success.",
     /*ERR_FILEREAD*/               "Couldn't open file: %s",
diff -Nurp hymn-0.8.0src.orig/src/hymn/keyutils.c hymn-0.8.0src/src/hymn/keyutils.c
--- src/hymn/keyutils.c	2004-05-08 22:18:05.000000000 +0000
+++ src/hymn/keyutils.c	2006-03-15 16:37:28.461077000 +0000
@@ -24,6 +24,9 @@
 #include <dirent.h>
 #include <fcntl.h>
 
+/* fix warnings */
+#include <stdio.h>
+
 #ifdef _WIN32
 #include <windows.h>
 #include <tchar.h>
diff -Nurp hymn-0.8.0src.orig/src/hymn/scramble.c hymn-0.8.0src/src/hymn/scramble.c
--- src/hymn/scramble.c	2005-05-18 02:27:01.000000000 +0000
+++ src/hymn/scramble.c	2006-03-15 16:37:43.931077000 +0000
@@ -284,4 +284,4 @@ void scramble(unsigned char* p_key)
 	for (i = 0, x = 0; i < 16; i++, x+= 256) {
 		p_key[i] = scramble_vector[p_key[i] + x];
 	}
-}
\ No newline at end of file
+}
diff -Nurp hymn-0.8.0src.orig/src/hymn/scramble.h hymn-0.8.0src/src/hymn/scramble.h
--- src/hymn/scramble.h	2005-05-18 02:27:01.000000000 +0000
+++ src/hymn/scramble.h	2006-03-15 16:36:48.821077000 +0000
@@ -22,4 +22,4 @@
  /* interface */
 int scramble(unsigned char* p_key);
 
- #endif /* __SCRAMBLE_H__ */
\ No newline at end of file
+ #endif /* __SCRAMBLE_H__ */