Skip to content

Commit 51dbc80

Browse files
vabvab
committed
updates: config + config memcmp calls, autotools, comments
Summary of changes: * Configuration related memcmp calls with invalid ranges were corrected * Autotools files were updated to be compatible with the latest versions * Header comments in source files were updated * User defined config file locations are no longer supported
1 parent f79c261 commit 51dbc80

11 files changed

+39
-58
lines changed

‎AUTHORS

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
Maintainer
22
----------
3-
V. Alex Brennen <[email protected]> [ http://vab.mit.edu/ ]
4-
3+
V. Alex Brennen <[email protected]>

‎BUGS

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
There are no known bugs.
2-

‎COPYING

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
This program is public domain. It is not copyrighted. You may do as you
22
wish with it.
3-

‎ChangeLog

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Version 1.2.1
2+
-------------
3+
Autotools updates
4+
Config memcmp call updates
5+
Removal of user defined config file location
6+
File comment header updates
7+
18
Version 1.2.0
29
-------------
310
Support for homoglyph suppression

‎NEWS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1+
2024.04.13 1.2.1 Released.
12
2011.06.18 1.2.0 Released.
23
2006.12.27 1.1.0 Released.
34
2006.10.14 1.0.0 Release. Initial Release.
4-

‎configure.ac

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
AC_INIT([passgen], [1.2.0])
2+
AC_INIT([passgen],[1.2.1])
33
AC_CONFIG_SRCDIR([src/passgen.c])
44
AM_INIT_AUTOMAKE
55

@@ -10,9 +10,6 @@ dnl Checks for programs.
1010
AC_PROG_CC
1111
AC_PROG_INSTALL
1212

13-
dnl Checks for header files.
14-
AC_HEADER_STDC
15-
1613
AC_SUBST(PKG_CPPFLAGS)
1714
AC_SUBST(PKG_LIBS)
1815
AC_SUBST(PKG_CFLAGS)
@@ -22,14 +19,12 @@ dnl Where to put passgen.conf
2219
if test [ \"NONE\" == \"$prefix\" ]; then
2320
AC_SUBST(CONFDIR, "/etc")
2421
AC_ARG_WITH(conf,
25-
AC_HELP_STRING([--with-conf=FILE],
26-
[where config file lives [[/etc]]]),
22+
AS_HELP_STRING([--with-conf=FILE],[where config file lives [[/etc]]]),
2723
CONF="${withval}")
2824
else
2925
AC_SUBST(CONFDIR, "$prefix/etc")
3026
AC_ARG_WITH(conf,
31-
AC_HELP_STRING([--with-confdir=DIR],
32-
[where config file lives [[/etc]]]),
27+
AS_HELP_STRING([--with-confdir=DIR],[where config file lives [[/etc]]]),
3328
CONFDIR="${withval}")
3429
fi
3530
AC_MSG_NOTICE([where to store config... $CONFDIR])
@@ -51,4 +46,5 @@ else
5146
fi
5247

5348
dnl Files to process
54-
AC_OUTPUT([Makefile etc/passgen.conf etc/Makefile src/Makefile doc/Makefile])
49+
AC_CONFIG_FILES([Makefile etc/passgen.conf etc/Makefile src/Makefile doc/Makefile])
50+
AC_OUTPUT

‎src/passgen.c

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
/* Author: V. Alex Brennen ([email protected]) */
2-
/* Copyright: None */
3-
/* License: Public Domain */
4-
/* Created: 2006.09.15 */
5-
/* Last Updated: 2011.06.18 */
1+
/* Author: V. Alex Brennen */
2+
/* Copyright: None */
3+
/* License: Public Domain */
64

75
#include "passgen.h"
86

@@ -14,7 +12,7 @@
1412

1513
int main(int argc,char *argv[])
1614
{
17-
const char version[] = "1.2.0";
15+
const char version[] = "1.2.1";
1816

1917
int rslt = 0;
2018
int arg = 0;
@@ -532,7 +530,7 @@ int print_help(void)
532530

533531
int invalid_argument(void)
534532
{
535-
fprintf(stderr,"passgen: Invalid arument given\n\n");
533+
fprintf(stderr,"passgen: Invalid argument given\n\n");
536534

537535
print_help();
538536

‎src/passgen.h

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
/* Author: V. Alex Brennen ([email protected]) */
2-
/* Copyright: None */
3-
/* License: Public Domain */
4-
/* Created: 2006.09.15 */
5-
/* Last Updated: 2011.06.18 */
1+
/* Author: V. Alex Brennen */
2+
/* Copyright: None */
3+
/* License: Public Domain */
64

75
#include <stdio.h>
86
#include <stdlib.h>
@@ -14,14 +12,12 @@
1412

1513

1614
/* The potential password types as static flags */
17-
#define D_DEFAULT 0
15+
#define D_DEFAULT 0
1816
#define D_ALPHA_NUMERIC 1
1917
#define D_ALPHA_ONLY 2
2018
#define D_NUMERIC_ONLY 3
2119

22-
2320
/* Function prototypes */
2421
int map_data_to_chars(struct passgen_config *);
2522
int print_help(void);
2623
int invalid_argument(void);
27-

‎src/passgen_conf.c

+6-12
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
/* Author: V. Alex Brennen ([email protected]) */
2-
/* Copyright: None */
3-
/* License: Public Domain */
4-
/* Created: 2006.12.26 */
5-
/* Last Updated: 2011.06.18 */
1+
/* Author: V. Alex Brennen */
2+
/* Copyright: None */
3+
/* License: Public Domain */
64

75
#include "passgen_conf.h"
86

@@ -37,11 +35,7 @@ int read_passgen_config(struct passgen_config **config)
3735
memset(line,0x00,513);
3836
memset(file_loc,0x00,1024);
3937

40-
if(file_exists(CONF))
41-
{
42-
strncpy(file_loc,CONF,1023);
43-
}
44-
else if(file_exists("/etc/passgen.conf"))
38+
if(file_exists("/etc/passgen.conf"))
4539
{
4640
strncpy(file_loc,"/etc/passgen.conf",63);
4741
}
@@ -132,7 +126,7 @@ int read_passgen_config(struct passgen_config **config)
132126
if(((*config)->passwd_type > 3) || ((*config)->passwd_type < 0))
133127
config_reject(name);
134128
}
135-
else if(memcmp(name,"homoglyph_suppression_level",26) == 0)
129+
else if(memcmp(name,"homoglyph_suppression_level",27) == 0)
136130
{
137131
if(!(isdigit(value[0])))
138132
config_reject(name);
@@ -141,7 +135,7 @@ int read_passgen_config(struct passgen_config **config)
141135
if(((*config)->homoglyph_suppression_level > 2) || ((*config)->homoglyph_suppression_level < 0))
142136
config_reject(name);
143137
}
144-
else if(memcmp(name,"forced_case",14) == 0)
138+
else if(memcmp(name,"forced_case",11) == 0)
145139
{
146140
int forced_case = 0;
147141

‎src/passgen_conf.h

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
/* Author: V. Alex Brennen ([email protected]) */
2-
/* Copyright: None */
3-
/* License: Public Domain */
4-
/* Created: 2006.12.26 */
5-
/* Last Updated: 2011.06.18 */
1+
/* Author: V. Alex Brennen */
2+
/* Copyright: None */
3+
/* License: Public Domain */
64

75
#include <stdio.h>
86
#include <stdlib.h>
@@ -14,8 +12,7 @@
1412
#include "passgen_datastructures.h"
1513

1614

17-
int init_passgen_config(struct passgen_config **);
18-
int read_passgen_config(struct passgen_config **);
19-
void config_reject(char *);
20-
int file_exists(char *);
21-
15+
int init_passgen_config(struct passgen_config **);
16+
int read_passgen_config(struct passgen_config **);
17+
void config_reject(char *);
18+
int file_exists(char *);

‎src/passgen_datastructures.h

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
/* Author: V. Alex Brennen ([email protected]) */
2-
/* Copyright: None */
3-
/* License: Public Domain */
4-
/* Created: 2006.12.26 */
5-
/* Last Updated: 2011.06.18 */
1+
/* Author: V. Alex Brennen */
2+
/* Copyright: None */
3+
/* License: Public Domain */
64

75
#ifndef PASSGEN_DATASTRUCTURES
86
#define PASSGEN_DATASTRUCTURES
97

10-
118
/* This is the basic configuration datastructure. It is initialized by
129
init_passgen_config() to default values. Later, it is reconfigured
1310
according to the /etc/passgen.conf file if it exists by the
@@ -27,4 +24,3 @@ struct passgen_config
2724
};
2825

2926
#endif
30-

0 commit comments

Comments
 (0)