Updates from 1.0.0-stable

diff --git a/apps/progs.h b/apps/progs.h
index d323a1caaba0511fbf6a5948f40416e63b040c9f..79e479a33768dfde2a5fbc98c132cd28ef5a86c6 100644 (file)
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -142,7 +142,9 @@ FUNCTION functions[] = {
 #ifndef OPENSSL_NO_ENGINE
        {FUNC_TYPE_GENERAL,"engine",engine_main},
 #endif
 #ifndef OPENSSL_NO_ENGINE
        {FUNC_TYPE_GENERAL,"engine",engine_main},
 #endif

+#ifndef OPENSSL_NO_OCSP

        {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
        {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},

+#endif

        {FUNC_TYPE_GENERAL,"prime",prime_main},
        {FUNC_TYPE_GENERAL,"ts",ts_main},
 #ifndef OPENSSL_NO_MD2
        {FUNC_TYPE_GENERAL,"prime",prime_main},
        {FUNC_TYPE_GENERAL,"ts",ts_main},
 #ifndef OPENSSL_NO_MD2

diff --git a/apps/progs.pl b/apps/progs.pl
index af5776054fd58169cdbc205fc675f933d85edef0..de6fdeabbd63a495773af80d41de3b9c4217528e 100644 (file)
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -22,6 +22,7 @@ typedef struct {
        const char *name;
        int (*func)(int argc,char *argv[]);
        } FUNCTION;
        const char *name;
        int (*func)(int argc,char *argv[]);
        } FUNCTION;

+DECLARE_LHASH_OF(FUNCTION);

 
 FUNCTION functions[] = {
 EOF
 
 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"; }
                { 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; }
        }
        else
                { print $str; }
        }

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index ab38cd52f09708d979b91a9182e1ef6d34f7bfd9..22599163ac655701557ecd07054b15ab4c149d60 100644 (file)
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -264,7 +264,7 @@ get_cryptodev_ciphers(const int **cnids)
                return (0);
        }
        memset(&sess, 0, sizeof(sess));
                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)
 
        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;
 
 {
        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;
                if (kop->crk_param[i].crp_p)
                        free(kop->crk_param[i].crp_p);
                kop->crk_param[i].crp_p = NULL;

diff --git a/util/domd b/util/domd
index 27c0211a5a06280be178196750338f98a574e900..bab48cb7a27e14477c4805b519f0e4c208370795 100755 (executable)
--- a/util/domd
+++ b/util/domd
@@ -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
     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
     ${PERL} $TOP/util/clean-depend.pl < Makefile.tmp > Makefile.new

+    RC=$?

     rm -f Makefile.tmp
 else
     rm -f Makefile.tmp
 else

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

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

+    RC=$?

 fi
 mv Makefile.new Makefile
 # unfake the presence of Kerberos
 rm $TOP/krb5.h
 fi
 mv Makefile.new Makefile
 # unfake the presence of Kerberos
 rm $TOP/krb5.h

+
+exit $RC