1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
--- a/src/lib/libcrack.h
+++ b/src/lib/libcrack.h
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <ctype.h>
+#include <stdarg.h>
#ifdef USE_PWD_H
#include <pwd.h>
@@ -74,16 +75,16 @@
extern char dawgmagic[];
-extern char **SplitOn();
-extern char *Clone();
-extern char *Mangle();
-extern char *Trim();
-extern char Chop();
-extern char ChopNL();
-extern int Debug();
-extern int PackDAWG();
+extern char **SplitOn(char, char *, int);
+extern char *Clone(char *);
+extern char *Mangle(char *, char *);
+extern char *Trim(char *);
+extern char Chop(char *);
+extern char ChopNL(char *);
+extern int Debug(int, char *, ...);
+extern int PackDAWG(FILE *, FILE *);
extern int ResetDAWG();
-extern int UnPackDAWG();
+extern int UnPackDAWG(FILE *, FILE *);
/* ------------------------------------------------------------------ */
@@ -117,7 +118,6 @@
PWDICT;
extern PWDICT *PWOpen();
-extern char *Mangle();
extern char *FascistCheck();
#define PW_WORDS(x) ((x)->header.pih_numwords)
--- a/src/lib/debug.c
+++ b/src/lib/debug.c
@@ -12,12 +12,11 @@
#include "libcrack.h"
int
-Debug (level, fmt, arg1, arg2, arg3, arg4, arg5, arg6)
- int level;
- char *fmt;
- char *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
+Debug (int level, char *fmt, ...)
{
- fprintf (stderr, fmt, arg1, arg2, arg3, arg4, arg5, arg6);
+ va_list args;
+ va_start(args, fmt);
+ vfprintf (stderr, fmt, args);
if (level < 0)
{
--- a/src/util/dawg.c
+++ b/src/util/dawg.c
@@ -19,7 +19,7 @@
int i;
int errcnt;
int packp;
- int (*fn) ();
+ int (*fn) (FILE *, FILE *);
errcnt = 0;
i = strlen (argv[0]);
--- a/src/libdes/des.h
+++ b/src/libdes/des.h
@@ -159,11 +159,7 @@
#else
/* some stupid compilers complain because I have declared char instead
* of const char */
-#ifdef HEADER_DES_LOCL_H
char *crypt(const char *buf,const char *salt);
-#else
-char *crypt();
-#endif
#endif
void des_ofb_encrypt(unsigned char *in,unsigned char *out,
int numbits,long length,des_key_schedule schedule,des_cblock *ivec);
--- a/src/util/elcid.h
+++ b/src/util/elcid.h
@@ -12,7 +12,7 @@
extern int elcid_init();
extern int elcid_bsize();
extern int elcid_pwsize();
-extern int elcid_mkcookies();
-extern int elcid_setup();
-extern int elcid_invalid();
-extern int elcid_test();
+extern int elcid_mkcookies(char **, char **, void **, int);
+extern int elcid_setup(char **);
+extern int elcid_invalid(char *);
+extern int elcid_test(char **, void **, char **, int);
|
