Commit 3ebf0be1 authored by Bodo Möller's avatar Bodo Möller
Browse files

Corrections.

parent cbcc5c01

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


 Changes between 0.9.4 and 0.9.5  [xx XXX 2000]



  *) New 'passwd' tool, currently only -fcrypt is implemented.

  *) New 'passwd' tool for crypt(3) and apr1 password hashes.

     [Bodo Moeller]



  *) Add command line password options to the remaining applications.

Makefile.org

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ dclean: 
rehash: rehash.time

rehash.time: certs

	@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; sh tools/c_rehash certs)

	touch .rehash.time

	touch rehash.time



test:   tests

apps/passwd.c

+12 −7
Original line number Diff line number Diff line 
/* apps/passwd.c */



#if !defined(NO_DES) || !defined(NO_MD5)

#if defined NO_MD5 || defined CHARSET_EBCDIC

# define NO_APR1

#endif



#if !defined(NO_DES) || !defined(NO_APR1)



#include <assert.h>

#include <string.h>
@@ -12,10 +16,6 @@ 
#include <openssl/evp.h>

#include <openssl/rand.h>



#if defined NO_MD5 || defined CHARSET_EBCDIC

# define NO_APR1

#endif



#ifndef NO_DES

# include <openssl/des.h>

#endif
@@ -461,6 +461,11 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, 
err:

	return 0;

	}

#endif



#else



int MAIN(int argc, char **argv)

	{

	fputs("Program not available.\n", stderr)

	EXIT(1);

	}

#endif