scip/diceware
1
0
Fork 0
mirror of https://codeberg.org/scip/diceware.git synced 2025-12-16 18:30:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

move to codeberg and fix memory leaks (#1)

Browse Source
This commit is contained in:
T. von Dein
2025-11-05 22:31:56 +01:00
parent 5c29ef69e0
commit 1ef2e34511
6 changed files with 191 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
*.o
dicepwgen

29
.woodpecker/build.yaml Normal file
View File

@@ -0,0 +1,29 @@
matrix:
platform:
- linux/amd64
labels:
platform: ${platform}
steps:
build-n-test:
when:
event: [push]
image: alpine:latest
commands:
- apk update
- apk add --no-cache bash build-base words-en gdb valgrind
# build
- make
# look for memory leaks etc
- valgrind --leak-check=full --show-reachable=yes ./dicepwgen 2>&1 | tee log | grep "All heap blocks were freed"
- cat log
# enable in case of a crash
#- gdb -batch -ex "run" -ex "bt" --args dicepwgen
# check if we really get a password
- ./dicepwgen -y | grep -E '[a-z]*%'
# check a custom dict file and if we get 6 words when requested
- test 6 -eq $(./dicepwgen -f contrib/american-english-insane -c 6 | tee log | sed 's/[a-zA-Z]//g' | wc -c)
- cat log

10
README.md
View File

@@ -1,6 +1,14 @@
[![status-badge](https://ci.codeberg.org/api/badges/15537/status.svg)](https://ci.codeberg.org/repos/15537)
[![License](https://img.shields.io/badge/license-GPL-blue.svg)](https://codeberg.org/scip/diceware/raw/branch/master/LICENSE)
[![Documentation](https://img.shields.io/badge/manpage-documentation-blue)](https://codeberg.org/scip/diceware/raw/branch/main/dicepwgen.pod)
## dicepwgen - A diceware password generator ## dicepwgen - A diceware password generator
This is the README file for the password generator dicepwgen. `dicepwgen` generates a [diceware password](https://de.wikipedia.org/wiki/Diceware)
using a dictionary file. By default it uses pseudo random dice tosses,
but it is also possible to use real dices and enter the numbers by using
the option `-t`, which is the most secure way to generate diceware passwords.
## Documentation ## Documentation

177
dicepwgen.c
View File

@@ -37,15 +37,13 @@ int usage() {
"-y --symbols Replace space with -, add non-letters\n" "-y --symbols Replace space with -, add non-letters\n"
"-d --debug Enable debug output\n" "-d --debug Enable debug output\n"
"-v --version Print program version\n" "-v --version Print program version\n"
"-h -? --help Print this help screen\n" "-h -? --help Print this help screen\n");
);
return 1; return 1;
} }
int WMIN, WMAX, humantoss, verbose, dontjump, symbols; int WMIN, WMAX, humantoss, verbose, dontjump, symbols;
int main(int argc, char **argv) {
int main (int argc, char **argv) {
int count = 4; int count = 4;
char *dictfile = NULL; char *dictfile = NULL;
int opt; int opt;
@@ -53,81 +51,82 @@ int main (int argc, char **argv) {
WMIN = 6; WMIN = 6;
WMAX = 10; WMAX = 10;
humantoss = verbose = dontjump = symbols = 0; humantoss = verbose = dontjump = symbols = 0;
static struct option longopts[] = { static struct option longopts[] = {
{ "wordcount", required_argument, NULL, 'c' }, {"wordcount", required_argument, NULL, 'c'},
{ "minlen", required_argument, NULL, 'l' }, {"minlen", required_argument, NULL, 'l'},
{ "maxlen", required_argument, NULL, 'm' }, {"maxlen", required_argument, NULL, 'm'},
{ "humantoss", required_argument, NULL, 't' }, {"humantoss", required_argument, NULL, 't'},
{ "dictfile", required_argument, NULL, 'f' }, {"dictfile", required_argument, NULL, 'f'},
{ "dontjump", no_argument, NULL, 'n' }, {"dontjump", no_argument, NULL, 'n'},
{ "symbols", no_argument, NULL, 'y' }, {"symbols", no_argument, NULL, 'y'},
{ "version", no_argument, NULL, 'v' }, {"version", no_argument, NULL, 'v'},
{ "help", no_argument, NULL, 'h' }, {"help", no_argument, NULL, 'h'},
{ "debug", no_argument, NULL, 'd' }, {"debug", no_argument, NULL, 'd'},
}; };
while ((opt = getopt_long(argc, argv, "l:m:tf:c:vh?dny", longopts, NULL)) != -1) { while ((opt = getopt_long(argc, argv, "l:m:tf:c:vh?dny", longopts, NULL)) !=
switch (opt) { -1) {
case 'v': switch (opt) {
fprintf(stderr, "This is %s version %s\n", argv[0], VERSION); case 'v':
return 1; fprintf(stderr, "This is %s version %s\n", argv[0], VERSION);
break; return 1;
case 'h': break;
case '?': case 'h':
return usage(); case '?':
break;
case 'c':
count = atoi(optarg);
break;
case 'l':
WMIN = atoi(optarg);
break;
case 'm':
WMAX = atoi(optarg);
break;
case 't':
humantoss = 1;
break;
case 'y':
symbols = 1;
break;
case 'd':
verbose++;
break;
case 'n':
dontjump = 1;
break;
case 'f':
dictfile = malloc(strlen(optarg));
strncpy(dictfile, optarg, strlen(optarg));
break;
default:
return usage(); return usage();
break; break;
} case 'c':
} count = atoi(optarg);
break;
case 'l':
WMIN = atoi(optarg);
break;
case 'm':
WMAX = atoi(optarg);
break;
case 't':
humantoss = 1;
break;
case 'y':
symbols = 1;
break;
case 'd':
verbose++;
break;
case 'n':
dontjump = 1;
break;
case 'f':
dictfile = malloc(strlen(optarg));
strncpy(dictfile, optarg, strlen(optarg));
break;
default:
return usage();
break;
}
}
if(dictfile == NULL) { if (dictfile == NULL) {
dictfile = STRINGIZE_VALUE_OF(DICTFILE); dictfile = STRINGIZE_VALUE_OF(DICTFILE);
} }
if(dontjump) { if (dontjump) {
WMIN = 0; WMIN = 0;
WMAX = 128; WMAX = 128;
} }
debug(" using dictfile: %s", dictfile);
debug("minimum word length: %d", WMIN);
debug("maximum word length: %d", WMAX);
if(humantoss)
debug("user rolls dices");
else
debug("program rolls dices");
getwords(dictfile, count);
return 0; debug(" using dictfile: %s", dictfile);
debug("minimum word length: %d", WMIN);
debug("maximum word length: %d", WMAX);
if (humantoss)
debug("user rolls dices");
else
debug("program rolls dices");
getwords(dictfile, count);
return 0;
} }
void getwords(char *dictfile, int count) { void getwords(char *dictfile, int count) {
@@ -140,20 +139,20 @@ void getwords(char *dictfile, int count) {
int *tossed; int *tossed;
char sep = ' '; char sep = ' ';
unsigned char *tosses; unsigned char *tosses;
words = fetch_dict(dictfile); words = fetch_dict(dictfile);
tossed = malloc(count * sizeof(int)); tossed = malloc(count * sizeof(int));
for(i=0; i<count; i++) { for (i = 0; i < count; i++) {
tosses = toss(5, i); tosses = toss(5, i);
one = tosses[0] * 10000; one = tosses[0] * 10000;
two = tosses[1] * 1000; two = tosses[1] * 1000;
three = tosses[2] * 100; three = tosses[2] * 100;
four = tosses[3] * 10; four = tosses[3] * 10;
five = tosses[4]; five = tosses[4];
pos = one + two + three + four + five; pos = one + two + three + four + five;
tossed[i] = pos; tossed[i] = pos;
@@ -161,23 +160,23 @@ void getwords(char *dictfile, int count) {
free(tosses); free(tosses);
} }
if(symbols) if (symbols)
sep = '-'; sep = '-';
for(i=0; i<count-1; i++) { for (i = 0; i < count - 1; i++) {
fprintf(stdout, "%s%c", words[tossed[i]], sep); fprintf(stdout, "%s%c", words[tossed[i]], sep);
} }
fprintf(stdout, "%s", words[tossed[count-1]]); fprintf(stdout, "%s", words[tossed[count - 1]]);
if(symbols) if (symbols)
fprintf(stdout, "%%8"); fprintf(stdout, "%%8");
fprintf(stdout, "\n"); fprintf(stdout, "\n");
free(tossed); free(tossed);
for(i=0; i<6666; i++) for (i = 0; i < 66667; i++)
if(words[i] != NULL) if (words[i] != NULL)
free(words[i]); free(words[i]);
free(words); free(words);

23
dicepwgen.h
View File

@@ -20,25 +20,26 @@
*/ */
#ifndef HAVE_DICE_H #ifndef HAVE_DICE_H
#define HAVE_DICE_H #define HAVE_DICE_H
#include <stdio.h>
#include <unistd.h>
#include <getopt.h>
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include <ctype.h> #include <ctype.h>
#include <getopt.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "debug.h"
#include "dictfile.h" #include "dictfile.h"
#include "tossing.h" #include "tossing.h"
#include "debug.h"
#define STRINGIZE(x) #x #define STRINGIZE(x) #x
#define STRINGIZE_VALUE_OF(x) STRINGIZE(x) #define STRINGIZE_VALUE_OF(x) STRINGIZE(x)
#define VERSION "1.2.0" // #define VERSION "1.3.0"
#define RLEN 1024 #define RLEN 1024
static const char VERSION[] = "1.3.0";
extern int humantoss; extern int humantoss;
extern int verbose; extern int verbose;
@@ -48,7 +49,7 @@ extern int WMIN;
extern int WMAX; extern int WMAX;
int usage(); int usage();
int main (int argc, char **argv); int main(int argc, char **argv);
void getwords(char *dictfile, int count); void getwords(char *dictfile, int count);
#endif #endif

107
dictfile.c
View File

@@ -27,39 +27,35 @@ int *incr_dicedigit(int *digits) {
be a multiple of 10000, the 2nd a multiple of 1000 and so on. be a multiple of 10000, the 2nd a multiple of 1000 and so on.
*/ */
if(digits[4] == 6) { if (digits[4] == 6) {
digits[4] = 1; digits[4] = 1;
if(digits[3] == 60) { if (digits[3] == 60) {
digits[3] = 10; digits[3] = 10;
if(digits[2] == 600) { if (digits[2] == 600) {
digits[2] = 100; digits[2] = 100;
if(digits[1] == 6000) { if (digits[1] == 6000) {
digits[1] = 1000; digits[1] = 1000;
digits[0] += 10000; /* may overflow to 71111, must be catched by caller */ digits[0] +=
} 10000; /* may overflow to 71111, must be catched by caller */
else } else
digits[1] += 1000; digits[1] += 1000;
} } else
else digits[2] += 100;
digits[2] += 100; } else
}
else
digits[3] += 10; digits[3] += 10;
} } else
else
digits[4]++; digits[4]++;
return digits; return digits;
} }
int get_dicenum(int *digits) { int get_dicenum(int *digits) {
/* /*
get the actual number of an array of dice digits get the actual number of an array of dice digits
*/ */
int i = 0; int i = 0;
int pos = 0; int pos = 0;
for(i=0; i<5; i++) for (i = 0; i < 5; i++)
pos += digits[i]; pos += digits[i];
return pos; return pos;
@@ -82,73 +78,72 @@ char **fetch_dict(char *dictfile) {
FILE *DICT; FILE *DICT;
int *digits; int *digits;
if((DICT = fopen(dictfile, "rb")) == NULL) { if ((DICT = fopen(dictfile, "rb")) == NULL) {
perror("Could not open dictfile"); perror("Could not open dictfile");
exit(1); exit(1);
} }
words = malloc(66666 * sizeof(char *)); words = malloc(66667 * sizeof(char *));
digits = malloc(5 * sizeof(int)); digits = malloc(5 * sizeof(int));
jump = rand_lim(32); jump = rand_lim(32);
digits[0] = 10000;
digits[1] = 1000;
digits[2] = 100;
digits[3] = 10;
digits[4] = 1;
pos = 11111; digits[0] = 10000;
digits[1] = 1000;
digits[2] = 100;
digits[3] = 10;
digits[4] = 1;
pos = 11111;
next = 0; next = 0;
for(i=0; i<6666; i++) for (i = 0; i < 66667; i++)
words[i] = NULL; words[i] = NULL;
LOOP:
LOOP:
while ((linelen = getline(&line, &len, DICT)) != -1) { while ((linelen = getline(&line, &len, DICT)) != -1) {
if(! dontjump) { if (!dontjump) {
if(jump > 0) { if (jump > 0) {
jump--; jump--;
continue; continue;
} } else {
else { jump = rand_lim(32);
jump = rand_lim(32);
} }
} }
if(linelen >= WMIN+1 && linelen <= WMAX+1) { if (linelen >= WMIN + 1 && linelen <= WMAX + 1) {
line[linelen-1] = '\0'; /* remove newline */ line[linelen - 1] = '\0'; /* remove newline */
for(i=0; i<linelen-1; i++) { for (i = 0; i < linelen - 1; i++) {
if(isalnum((int)line[i]) == 0) { if (isalnum((int)line[i]) == 0) {
next = 1; next = 1;
break; break;
} }
} }
if(next) { if (next) {
next = 0; next = 0;
continue; continue;
} }
words[pos] = malloc(linelen); words[pos] = malloc(linelen);
strncpy( words[pos], line, linelen); strncpy(words[pos], line, linelen);
if(verbose > 1) if (verbose > 1)
debug("add to wordlist at index %d: %s", pos, line); debug("add to wordlist at index %d: %s", pos, line);
digits = incr_dicedigit(digits); digits = incr_dicedigit(digits);
pos = get_dicenum(digits); pos = get_dicenum(digits);
/* this is what pos gets next after 66666, which is max reachable with 5 dices */ /* this is what pos gets next after 66666, which is max reachable with 5
if(pos == 71111) * dices */
break; if (pos == 71111)
break;
} /* endif word 4<=>10 */ } /* endif word 4<=>10 */
} /* while read */ } /* while read */
if(pos < 66666) { if (pos < 66666) {
fseek(DICT, 0L, SEEK_SET); fseek(DICT, 0L, SEEK_SET);
goto LOOP; goto LOOP;
} }
fclose(DICT); fclose(DICT);
free(line); free(line);
free(digits); free(digits);