Commit e5b2b0f9 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Updates from 1.0.0-stable

parent ccf11751

apps/progs.h

+2 −0
Original line number Diff line number Diff line
@@ -142,7 +142,9 @@ FUNCTION functions[] = { 
#ifndef OPENSSL_NO_ENGINE

	{FUNC_TYPE_GENERAL,"engine",engine_main},

#endif

#ifndef OPENSSL_NO_OCSP

	{FUNC_TYPE_GENERAL,"ocsp",ocsp_main},

#endif

	{FUNC_TYPE_GENERAL,"prime",prime_main},

	{FUNC_TYPE_GENERAL,"ts",ts_main},

#ifndef OPENSSL_NO_MD2

apps/progs.pl

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ typedef struct { 
	const char *name;

	int (*func)(int argc,char *argv[]);

	} FUNCTION;

DECLARE_LHASH_OF(FUNCTION);



FUNCTION functions[] = {

EOF
@@ -48,6 +49,8 @@ foreach (@ARGV) 
		{ print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }

	elsif ( ($_ =~ /^cms$/))

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

	elsif ( ($_ =~ /^ocsp$/))

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

	else

		{ print $str; }

	}

crypto/engine/eng_cryptodev.c

+2 −2
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ get_cryptodev_ciphers(const int **cnids) 
		return (0);

	}

	memset(&sess, 0, sizeof(sess));

	sess.key = (caddr_t)"123456781234567812345678";

	sess.key = (caddr_t)"123456789abcdefghijklmno";



	for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) {

		if (ciphers[i].nid == NID_undef)
@@ -681,7 +681,7 @@ zapparams(struct crypt_kop *kop) 
{

	int i;



	for (i = 0; i <= kop->crk_iparams + kop->crk_oparams; i++) {

	for (i = 0; i < kop->crk_iparams + kop->crk_oparams; i++) {

		if (kop->crk_param[i].crp_p)

			free(kop->crk_param[i].crp_p);

		kop->crk_param[i].crp_p = NULL;

util/domd

+6 −2
Original line number Diff line number Diff line
@@ -22,13 +22,17 @@ if expr "$MAKEDEPEND" : '.*gcc$' > /dev/null; then 
    done

    sed -e '/^# DO NOT DELETE.*/,$d' < Makefile > Makefile.tmp

    echo '# DO NOT DELETE THIS LINE -- make depend depends on it.' >> Makefile.tmp

    ${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp || exit

    ${MAKEDEPEND} -Werror -D OPENSSL_DOING_MAKEDEPEND -M $args >> Makefile.tmp || exit 1

    ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new

    RC=$?

    rm -f Makefile.tmp

else

    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@

    ${MAKEDEPEND} -D OPENSSL_DOING_MAKEDEPEND $@ && \

    ${PERL} $TOP/util/clean-depend.pl < Makefile > Makefile.new

    RC=$?

fi

mv Makefile.new Makefile

# unfake the presence of Kerberos

rm $TOP/krb5.h



exit $RC