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

avoid some NO_<cipher> problems

parent 2b8e4959

Configure

+12 −0
Original line number Diff line number Diff line
@@ -720,6 +720,18 @@ EOF 


	system "perl crypto/objects/obj_dat.pl <crypto/objects/objects.h >crypto/objects/obj_dat.h";

} else {

	open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";

	printf OUT <<EOF;

#ifndef MK1MF_BUILD

  /* auto-generated by Configure for crypto/cversion.c:

   * for Unix builds, crypto/Makefile.ssl generates functional definitions;

   * Windows builds (and other mk1mf builds) compile cversion.c with

   * -DMK1MF_BUILD and use definitions added to this file by util/mk1mf.pl. */

  #error "Windows builds (PLATFORM=$target) use mk1mf.pl-created Makefiles"

#endif

EOF

	close(OUT);



	(system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?;

	### (system 'make depend') == 0 or exit $? if $depflags ne "";

	# Run "make depend" manually if you want to be able to delete

apps/pkcs12.c

+4 −0
Original line number Diff line number Diff line 
/* pkcs12.c */

#if !defined(NO_DES) && !defined(NO_SHA1)



/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL

 * project 1999.

 */
@@ -697,3 +699,5 @@ void hex_prin(BIO *out, unsigned char *buf, int len) 
	int i;

	for (i = 0; i < len; i++) BIO_printf (out, "%02X ", buf[i]);

}



#endif

apps/progs.h

+3 −1
Original line number Diff line number Diff line
@@ -86,11 +86,13 @@ FUNCTION functions[] = { 
	{FUNC_TYPE_GENERAL,"pkcs7",pkcs7_main},

	{FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main},

	{FUNC_TYPE_GENERAL,"sess_id",sess_id_main},

#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(O_SSL3))

#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))

	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},

#endif

	{FUNC_TYPE_GENERAL,"nseq",nseq_main},

#if !defined(NO_DES) && !defined(NO_SHA1)

	{FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main},

#endif

	{FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main},

	{FUNC_TYPE_MD,"md2",dgst_main},

	{FUNC_TYPE_MD,"md5",dgst_main},

crypto/Makefile.ssl

+2 −0
Original line number Diff line number Diff line
@@ -122,7 +122,9 @@ lint: 
	done;



depend:

	if [ ! -e buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist

	$(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC)

	if [ ! -s buildinf.h ]; then rm buildinf.h; fi

	@for i in $(SDIRS) ;\

	do \

	(cd $$i; echo "making depend in crypto/$$i..."; \

crypto/x509v3/Makefile.ssl

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ lint: 
	lint -DLINT $(INCLUDES) $(SRC)>fluff



depend:

	$(MAKEDEPEND) $(INCLUDES) $(DEPFLFAG) $(PROGS) $(LIBSRC)

	$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)



dclean:

	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new