projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include system.h and ABOUT-NLS.
[tinc]
/
src
/
genauth.c
diff --git
a/src/genauth.c
b/src/genauth.c
index
0d47d51
..
976e310
100644
(file)
--- a/
src/genauth.c
+++ b/
src/genauth.c
@@
-1,6
+1,6
@@
/*
genauth.c -- generate a random passphrase
/*
genauth.c -- generate a random passphrase
- Copyright (C) 1998,
99
Ivo Timmermans <zarq@iname.com>
+ Copyright (C) 1998,
1999,2000
Ivo Timmermans <zarq@iname.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-27,6
+27,8
@@
#include "encr.h"
#include "encr.h"
+#include "system.h"
+
unsigned char initvec[] = { 0x22, 0x7b, 0xad, 0x55, 0x41, 0xf4, 0x3e, 0xf3 };
int main(int argc, char **argv)
unsigned char initvec[] = { 0x22, 0x7b, 0xad, 0x55, 0x41, 0xf4, 0x3e, 0xf3 };
int main(int argc, char **argv)
@@
-35,58
+37,62
@@
int main(int argc, char **argv)
int bits, c, i, bytes;
unsigned char *p;
int bits, c, i, bytes;
unsigned char *p;
- if(argc
!= 2
)
+ if(argc
> 2 || (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")))
)
{
{
- fprintf(stderr,
"Usage: %s bits\n"
, argv[0]);
+ fprintf(stderr,
_("Usage: %s bits\n")
, argv[0]);
return 1;
}
return 1;
}
+ if(!argv[1])
+ argv[1] = "1024";
+
if(!(bits = atol(argv[1])))
{
if(!(bits = atol(argv[1])))
{
- fprintf(stderr,
"Illegal number: %s\n"
, argv[1]);
+ fprintf(stderr,
_("Illegal number: %s\n")
, argv[1]);
return 1;
}
bits = ((bits - 1) | 63) + 1;
return 1;
}
bits = ((bits - 1) | 63) + 1;
- fprintf(stderr,
"Generating %d bits number"
, bits);
+ fprintf(stderr,
_("Generating %d bits number")
, bits);
bytes = bits >> 3;
if((fp = fopen("/dev/urandom", "r")) == NULL)
{
bytes = bits >> 3;
if((fp = fopen("/dev/urandom", "r")) == NULL)
{
- perror(
"Opening /dev/urandom"
);
+ perror(
_("Opening /dev/urandom")
);
return 1;
}
p = xmalloc(bytes);
setbuf(stdout, NULL);
return 1;
}
p = xmalloc(bytes);
setbuf(stdout, NULL);
- for(i = 0; i <
128
; i++)
+ for(i = 0; i <
bytes
; i++)
{
c = fgetc(fp);
if(feof(fp))
{
puts("");
{
c = fgetc(fp);
if(feof(fp))
{
puts("");
- fprintf(stderr,
"File was empty!\n"
);
+ fprintf(stderr,
_("File was empty!\n")
);
}
p[i] = c;
}
}
p[i] = c;
}
+ fclose(fp);
-
for(i = 0; i < (bytes); i++
)
+
if(isatty(1)
)
{
{
- c = fgetc(fp);
- if(feof(fp))
- {
- puts("");
- fprintf(stderr, "File was empty!\n");
- }
- p[i] = c;
+ fprintf(stderr, _(": done.\nThe following line should be ENTIRELY copied into a passphrase file:\n"));
+ printf("%d ", bits);
+ for(i = 0; i < bytes; i++)
+ printf("%02x", p[i]);
+ puts("");
+ }
+ else
+ {
+ printf("%d ", bits);
+ for(i = 0; i < bytes; i++)
+ printf("%02x", p[i]);
+ puts("");
+ fprintf(stderr, _(": done.\n"));
}
}
- fclose(fp);
-
- printf("%d ", bits);
- for(i = 0; i < bytes; i++)
- printf("%02x", p[i]);
- puts("");
return 0;
}
return 0;
}