Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 126318
Collapse All | Expand All

(-)src/cli/cli.c (+3 lines)
Lines 23-28 Link Here
23
#include <unistd.h>
23
#include <unistd.h>
24
#include <sys/stat.h>
24
#include <sys/stat.h>
25
25
26
/* fix warnings */
27
#include <string.h>
28
26
#include "config.h"
29
#include "config.h"
27
#include "hymn.h"
30
#include "hymn.h"
28
#include "filename.h"
31
#include "filename.h"
(-)src/cli/Makefile.am (-1 / +1 lines)
Lines 1-6 Link Here
1
bin_PROGRAMS = hymn
1
bin_PROGRAMS = hymn
2
hymn_SOURCES = cli.c filename.c filename.h
2
hymn_SOURCES = cli.c filename.c filename.h
3
hymn_LDADD = ../hymn/libhymn.a @CLI_LDADD@
3
hymn_LDADD = ../hymn/libhymn.a /usr/lib/libsysfs.a @CLI_LDADD@
4
hymn_LDFLAGS = -static
4
hymn_LDFLAGS = -static
5
5
6
INCLUDES = -I@top_srcdir@/src/hymn
6
INCLUDES = -I@top_srcdir@/src/hymn
(-)src/hymn/aes.c (+3 lines)
Lines 20-25 Link Here
20
20
21
#include "aes.h"
21
#include "aes.h"
22
22
23
/* fix warnings */
24
#include <string.h>
25
23
/* forward S-box */
26
/* forward S-box */
24
27
25
static uint32 FSb[256] =
28
static uint32 FSb[256] =
(-)src/hymn/atoms.h (+5 lines)
Lines 19-24 Link Here
19
* USA.
19
* USA.
20
*****************************************************************************/
20
*****************************************************************************/
21
21
22
/* fix warnings */
23
#ifdef HAVE_STRING_H
24
#   include <string.h>
25
#endif
26
22
/* container atoms */
27
/* container atoms */
23
#define ATOM_ALB  UINT32_FROM_BYTES(0xa9,'a','l','b')
28
#define ATOM_ALB  UINT32_FROM_BYTES(0xa9,'a','l','b')
24
#define ATOM_ART  UINT32_FROM_BYTES(0xa9,'A','R','T')
29
#define ATOM_ART  UINT32_FROM_BYTES(0xa9,'A','R','T')
(-)src/hymn/drms.c (+5 lines)
Lines 72-77 Link Here
72
#include "drms.h"
72
#include "drms.h"
73
#include "drmstables.h"
73
#include "drmstables.h"
74
74
75
/* fix warnings */
76
#ifdef HAVE_STRING_H
77
#   include <string.h>
78
#endif
79
75
/*****************************************************************************
80
/*****************************************************************************
76
 * aes_s: AES keys structure
81
 * aes_s: AES keys structure
77
 *****************************************************************************
82
 *****************************************************************************
(-)src/hymn/hymn.h (-1 / +1 lines)
Lines 57-63 static int ERR_KEY_DECRYPT = 11; Link Here
57
static int ERR_COULDNT_UPGRADE = 12;
57
static int ERR_COULDNT_UPGRADE = 12;
58
58
59
/* error message array -- must keep in sync w/ hymn.h */
59
/* error message array -- must keep in sync w/ hymn.h */
60
static const char *ERROR_MESSAGES[13] =
60
static const char *ERROR_MESSAGES[14] =
61
{
61
{
62
    /*SUCCESS*/                    "Success.",
62
    /*SUCCESS*/                    "Success.",
63
    /*ERR_FILEREAD*/               "Couldn't open file: %s",
63
    /*ERR_FILEREAD*/               "Couldn't open file: %s",
(-)src/hymn/keyutils.c (+3 lines)
Lines 24-29 Link Here
24
#include <dirent.h>
24
#include <dirent.h>
25
#include <fcntl.h>
25
#include <fcntl.h>
26
26
27
/* fix warnings */
28
#include <stdio.h>
29
27
#ifdef _WIN32
30
#ifdef _WIN32
28
#include <windows.h>
31
#include <windows.h>
29
#include <tchar.h>
32
#include <tchar.h>
(-)src/hymn/scramble.c (-1 / +1 lines)
Lines 284-287 void scramble(unsigned char* p_key) Link Here
284
	for (i = 0, x = 0; i < 16; i++, x+= 256) {
284
	for (i = 0, x = 0; i < 16; i++, x+= 256) {
285
		p_key[i] = scramble_vector[p_key[i] + x];
285
		p_key[i] = scramble_vector[p_key[i] + x];
286
	}
286
	}
287
}
287
}
(-)src/hymn/scramble.h (-1 / +1 lines)
Lines 22-25 Link Here
22
 /* interface */
22
 /* interface */
23
int scramble(unsigned char* p_key);
23
int scramble(unsigned char* p_key);
24
24
25
 #endif /* __SCRAMBLE_H__ */
25
 #endif /* __SCRAMBLE_H__ */

Return to bug 126318