Commit 06d5b162 authored by Ralf S. Engelschall's avatar Ralf S. Engelschall
Browse files

First cut of a cleanup for apps/. First the `ssleay' program is now named 

`openssl' and second, the shortcut symlinks for the `openssl <command>' are no
longer created. This way we have a single and consistent command line
interface `openssl <command>', similar to `cvs <command>'.

Notice, the openssl.cnf, openssl.c and progs.pl files were changed after a
repository copy, i.e. they still contain the complete file history.
parent 0491b709

CHANGES

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,12 @@ 


 Changes between 0.9.1c and 0.9.2



  *) First cut of a cleanup for apps/. First the `ssleay' program is now named

     `openssl' and second, the shortcut symlinks for the `openssl <command>'

     are no longer created. This way we have a single and consistent command

     line interface `openssl <command>', similar to `cvs <command>'.

     [Ralf S. Engelschall]



  *) ca.c: move test for DSA keys inside #ifndef NO_DSA. Make pubkey

     BIT STRING wrapper always have zero unused bits.

     [Steve Henson]

apps/.cvsignore

+1 −1
Original line number Diff line number Diff line 
ssleay
 
openssl

apps/Makefile.ssl

+14 −20
Original line number Diff line number Diff line 
#

# SSLeay/apps/Makefile.ssl

#  apps/Makefile.ssl

#



DIR=		apps
@@ -25,18 +25,18 @@ DLIBSSL=../libssl.a 
LIBCRYPTO=-L.. -lcrypto

LIBSSL=-L.. -lssl



SSLEAY= ssleay

PROGRAM= openssl



SCRIPTS=CA.sh der_chop CA.pl

SCRIPTS=CA.sh CA.pl der_chop



EXE= $(SSLEAY)

EXE= $(PROGRAM)



E_EXE=	verify asn1pars req dgst dh enc gendh errstr ca crl \

	rsa dsa dsaparam \

	x509 genrsa s_server s_client speed \

	s_time version pkcs7 crl2pkcs7 sess_id ciphers



PROGS= $(SSLEAY).c

PROGS= $(PROGRAM).c



A_OBJ=apps.o

A_SRC=apps.c
@@ -86,18 +86,15 @@ sreq.o: req.c 
files:

	perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO



install: mklinks

	@for i in $(EXE) $(SCRIPTS) mklinks; \

install:

	@for i in $(EXE) $(SCRIPTS); \

	do  \

	(echo installing $$i; \

	 cp $$i $(INSTALLTOP)/bin/$$i; \

	 chmod 755 $(INSTALLTOP)/bin/$$i ); \

	 done; \

	cp ssleay.cnf $(INSTALLTOP)/lib

	chmod 644 $(INSTALLTOP)/lib/ssleay.cnf

	cd $(INSTALLTOP)/bin; \

	/bin/sh ./mklinks; \

	/bin/rm -f ./mklinks

	cp openssl.cnf $(INSTALLTOP)/lib; \

	chmod 644 $(INSTALLTOP)/lib/openssl.cnf



tags:

	ctags $(SRC)
@@ -130,15 +127,12 @@ $(DLIBSSL): 
$(DLIBCRYPTO):

	(cd ../crypto; $(MAKE))



$(SSLEAY): progs.h $(E_OBJ) $(SSLEAY).o $(DLIBCRYPTO) $(DLIBSSL)

	$(RM) $(SSLEAY)

	$(CC) -o $(SSLEAY) $(CFLAGS) $(SSLEAY).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)

$(PROGRAM): progs.h $(E_OBJ) $(PROGRAM).o $(DLIBCRYPTO) $(DLIBSSL)

	$(RM) $(PROGRAM)

	$(CC) -o $(PROGRAM) $(CFLAGS) $(PROGRAM).o $(E_OBJ) $(PEX_LIBS) $(LIBSSL) $(LIBCRYPTO) $(EX_LIBS)



progs.h:

	perl ./g_ssleay.pl $(E_EXE) >progs.h

	$(RM) $(SSLEAY).o



mklinks:

	perl ./g_ssleay.pl $(E_EXE) >progs.h

	perl ./progs.pl $(E_EXE) >progs.h

	$(RM) $(PROGRAM).o



# DO NOT DELETE THIS LINE -- make depend depends on it.

apps/ext.v3

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
2.99999.3	SET.ex3		SET x509v3 extension 3

apps/g_ssleay.pl

deleted100644 → 0
+0 −114
Original line number Diff line number Diff line 
#!/usr/local/bin/perl



$mkprog='mklinks';

$rmprog='rmlinks';



print "#ifndef NOPROTO\n";



grep(s/^asn1pars$/asn1parse/,@ARGV);



foreach (@ARGV)

	{ printf "extern int %s_main(int argc,char *argv[]);\n",$_; }

print "#else\n";

foreach (@ARGV)

	{ printf "extern int %s_main();\n",$_; }

print "#endif\n";





print <<'EOF';



#ifdef SSLEAY_SRC



#define FUNC_TYPE_GENERAL	1

#define FUNC_TYPE_MD		2

#define FUNC_TYPE_CIPHER	3



typedef struct {

	int type;

	char *name;

	int (*func)();

	} FUNCTION;



FUNCTION functions[] = {

EOF



foreach (@ARGV)

	{

	push(@files,$_);

	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";

	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))

		{ print "#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3))\n${str}#endif\n"; } 

	elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) ||

		($_ =~ /^req$/) || ($_ =~ /^ca$/) || ($_ =~ /^x509$/))

		{ print "#ifndef NO_RSA\n${str}#endif\n";  }

	elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))

		{ print "#ifndef NO_DSA\n${str}#endif\n"; }

	elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/))

		{ print "#ifndef NO_DH\n${str}#endif\n"; }

	else

		{ print $str; }

	}



foreach ("md2","md5","sha","sha1","mdc2","rmd160")

	{

	push(@files,$_);

	printf "\t{FUNC_TYPE_MD,\"%s\",dgst_main},\n",$_;

	}



foreach (

	"base64",

	"des", "des3", "desx", "idea", "rc4", "rc2","bf","cast","rc5",

	"des-ecb", "des-ede",    "des-ede3",

	"des-cbc", "des-ede-cbc","des-ede3-cbc",

	"des-cfb", "des-ede-cfb","des-ede3-cfb",

	"des-ofb", "des-ede-ofb","des-ede3-ofb",

	"idea-cbc","idea-ecb",   "idea-cfb", "idea-ofb",

	"rc2-cbc", "rc2-ecb",    "rc2-cfb",  "rc2-ofb",

	"bf-cbc",  "bf-ecb",     "bf-cfb",   "bf-ofb",

	"cast5-cbc","cast5-ecb", "cast5-cfb","cast5-ofb",

	"cast-cbc", "rc5-cbc",   "rc5-ecb",  "rc5-cfb",  "rc5-ofb")

	{

	push(@files,$_);



	$t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\n",$_);

	if    ($_ =~ /des/)  { $t="#ifndef NO_DES\n${t}#endif\n"; }

	elsif ($_ =~ /idea/) { $t="#ifndef NO_IDEA\n${t}#endif\n"; }

	elsif ($_ =~ /rc4/)  { $t="#ifndef NO_RC4\n${t}#endif\n"; }

	elsif ($_ =~ /rc2/)  { $t="#ifndef NO_RC2\n${t}#endif\n"; }

	elsif ($_ =~ /bf/)   { $t="#ifndef NO_BLOWFISH\n${t}#endif\n"; }

	elsif ($_ =~ /cast/) { $t="#ifndef NO_CAST\n${t}#endif\n"; }

	elsif ($_ =~ /rc5/)  { $t="#ifndef NO_RC5\n${t}#endif\n"; }

	print $t;

	}



print "\t{0,NULL,NULL}\n\t};\n";

print "#endif\n\n";



open(OUT,">$mkprog") || die "unable to open '$prog':$!\n";

print OUT "#!/bin/sh\nfor i in ";

foreach (@files)

	{ print OUT $_." "; }

print OUT <<'EOF';



do

echo making symlink for $i

/bin/rm -f $i

ln -s ssleay $i

done

EOF

close(OUT);

chmod(0755,$mkprog);



open(OUT,">$rmprog") || die "unable to open '$prog':$!\n";

print OUT "#!/bin/sh\nfor i in ";

foreach (@files)

	{ print OUT $_." "; }

print OUT <<'EOF';



do

echo removing $i

/bin/rm -f $i

done

EOF

close(OUT);

chmod(0755,$rmprog);