On Tue, 26 Aug 2014, Kevin Brott wrote: > Good news/Bad News > > The test race in RHEL 3.4 seems to be gone ... but another ec.h failure ... > > Using http://www.mindrot.org/openssh_snap/openssh-SNAP-20140827.tar.gz > OS Build_Target CC > OpenSSL BUILD TEST > ============== =========================== ================ > ============= ====== ================= > RHEL 3.4 i386-redhat-linux gcc 3.2.3-47 > 1.0.1i**a OK*1 all tests passed > AIX 5300-12-04 powerpc-ibm-aix5.3.0.0 gcc 4.2.0-3 0.9.8k > FAIL*1 > > regress/unittests/sshbuf/test_sshbuf_getput_crypto.o > regress/unittests/sshbuf/test_sshbuf_getput_crypto.c:20:24: error: > openssl/ec.h: No such file or directory The other good news is that it has made it to unittests :) Index: regress/unittests/sshbuf/test_sshbuf_getput_crypto.c =================================================================== RCS file: /var/cvs/openssh/regress/unittests/sshbuf/test_sshbuf_getput_crypto.c,v retrieving revision 1.4 diff -u -p -r1.4 test_sshbuf_getput_crypto.c --- regress/unittests/sshbuf/test_sshbuf_getput_crypto.c 11 Jun 2014 19:32:29 -0000 1.4 +++ regress/unittests/sshbuf/test_sshbuf_getput_crypto.c 26 Aug 2014 18:02:30 -0000 @@ -17,8 +17,10 @@ #include <string.h> #include <openssl/bn.h> -#include <openssl/ec.h> #include <openssl/objects.h> +#ifdef OPENSSL_HAS_NISTP256 +# include <openssl/ec.h> +#endif #include "../test_helper/test_helper.h" #include "ssherr.h" @@ -32,7 +34,7 @@ sshbuf_getput_crypto_tests(void) struct sshbuf *p1; const u_char *d; size_t s; - BIGNUM *bn, *bn2, *bn_x, *bn_y; + BIGNUM *bn, *bn2; /* This one has num_bits != num_bytes * 8 to test bignum1 encoding */ const char *hexbn1 = "0102030405060708090a0b0c0d0e0f10"; /* This one has MSB set to test bignum2 encoding negative-avoidance */ @@ -47,6 +49,7 @@ sshbuf_getput_crypto_tests(void) 0x7f, 0xff, 0x11 }; #ifdef OPENSSL_HAS_NISTP256 + BIGNUM *bn_x, *bn_y; int ec256_nid = NID_X9_62_prime256v1; char *ec256_x = "0C828004839D0106AA59575216191357" "34B451459DADB586677EF9DF55784999"; Index: regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c =================================================================== RCS file: /var/cvs/openssh/regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c,v retrieving revision 1.5 diff -u -p -r1.5 test_sshbuf_getput_fuzz.c --- regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c 11 Jun 2014 19:32:29 -0000 1.5 +++ regress/unittests/sshbuf/test_sshbuf_getput_fuzz.c 26 Aug 2014 18:02:30 -0000 @@ -17,8 +17,10 @@ #include <string.h> #include <openssl/bn.h> -#include <openssl/ec.h> #include <openssl/objects.h> +#ifdef OPENSSL_HAS_NISTP256 +# include <openssl/ec.h> +#endif #include "../test_helper/test_helper.h" #include "ssherr.h" Index: regress/unittests/sshkey/common.c =================================================================== RCS file: /var/cvs/openssh/regress/unittests/sshkey/common.c,v retrieving revision 1.2 diff -u -p -r1.2 common.c --- regress/unittests/sshkey/common.c 20 Jul 2014 20:30:26 -0000 1.2 +++ regress/unittests/sshkey/common.c 26 Aug 2014 18:02:30 -0000 @@ -20,10 +20,12 @@ #include <unistd.h> #include <openssl/bn.h> -#include <openssl/ec.h> #include <openssl/rsa.h> #include <openssl/dsa.h> #include <openssl/objects.h> +#ifdef OPENSSL_HAS_NISTP256 +# include <openssl/ec.h> +#endif #include "../test_helper/test_helper.h" Index: regress/unittests/sshkey/test_file.c =================================================================== RCS file: /var/cvs/openssh/regress/unittests/sshkey/test_file.c,v retrieving revision 1.3 diff -u -p -r1.3 test_file.c --- regress/unittests/sshkey/test_file.c 22 Jul 2014 18:27:51 -0000 1.3 +++ regress/unittests/sshkey/test_file.c 26 Aug 2014 18:02:31 -0000 @@ -20,10 +20,12 @@ #include <unistd.h> #include <openssl/bn.h> -#include <openssl/ec.h> #include <openssl/rsa.h> #include <openssl/dsa.h> #include <openssl/objects.h> +#ifdef OPENSSL_HAS_NISTP256 +# include <openssl/ec.h> +#endif #include "../test_helper/test_helper.h" Index: regress/unittests/sshkey/test_fuzz.c =================================================================== RCS file: /var/cvs/openssh/regress/unittests/sshkey/test_fuzz.c,v retrieving revision 1.3 diff -u -p -r1.3 test_fuzz.c --- regress/unittests/sshkey/test_fuzz.c 22 Jul 2014 18:27:51 -0000 1.3 +++ regress/unittests/sshkey/test_fuzz.c 26 Aug 2014 18:02:31 -0000 @@ -20,10 +20,12 @@ #include <unistd.h> #include <openssl/bn.h> -#include <openssl/ec.h> #include <openssl/rsa.h> #include <openssl/dsa.h> #include <openssl/objects.h> +#ifdef OPENSSL_HAS_NISTP256 +# include <openssl/ec.h> +#endif #include "../test_helper/test_helper.h" Index: regress/unittests/sshkey/test_sshkey.c =================================================================== RCS file: /var/cvs/openssh/regress/unittests/sshkey/test_sshkey.c,v retrieving revision 1.3 diff -u -p -r1.3 test_sshkey.c --- regress/unittests/sshkey/test_sshkey.c 22 Jul 2014 18:27:51 -0000 1.3 +++ regress/unittests/sshkey/test_sshkey.c 26 Aug 2014 18:02:31 -0000 @@ -17,9 +17,11 @@ #include <string.h> #include <openssl/bn.h> -#include <openssl/ec.h> #include <openssl/rsa.h> #include <openssl/dsa.h> +#ifdef OPENSSL_HAS_NISTP256 +# include <openssl/ec.h> +#endif #include "../test_helper/test_helper.h" _______________________________________________ openssh-unix-dev mailing list openssh-unix-dev@xxxxxxxxxxx https://lists.mindrot.org/mailman/listinfo/openssh-unix-dev