[openssl-commits] [openssl] master update
The branch master has been updated via c0b4ff16755c5ced1bde62dd34f9df0ab8967f12 (commit) from fee65521e7af40d6fcedf68c515f602bdb11f565 (commit) - Log - commit c0b4ff16755c5ced1bde62dd34f9df0ab8967f12 Author: Matt CaswellDate: Thu May 4 16:15:17 2017 +0100 Remove some out of date text inadvertently left behind Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3386) --- Summary of changes: doc/man3/SSL_CONF_cmd.pod | 11 --- 1 file changed, 11 deletions(-) diff --git a/doc/man3/SSL_CONF_cmd.pod b/doc/man3/SSL_CONF_cmd.pod index 6731cf7..18cc88f 100644 --- a/doc/man3/SSL_CONF_cmd.pod +++ b/doc/man3/SSL_CONF_cmd.pod @@ -62,17 +62,6 @@ If a server does not request a certificate this option has no effect. The syntax of B is identical to B<-sigalgs>. If not set then the value set for B<-sigalgs> will be used instead. -=item B<-curves> - -This sets the supported elliptic curves. For clients the curves are -sent using the supported curves extension. For servers it is used -to determine which curve to use. This setting affects curves used for both -signatures and key exchange, if applicable. - -The B argument is a colon separated list of curves. The curve can be -either the B name (e.g. B) or an OpenSSL OID name (e.g -B). Curve names are case sensitive. - =item B<-groups> This sets the supported groups. For clients, the groups are _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] OpenSSL_1_0_2-stable update
The branch OpenSSL_1_0_2-stable has been updated via 4ae5993cab1b1c42cfc99180c00ae0a235ce940c (commit) from 16d78fbc2a6804453824752110737ab7b7f04ea8 (commit) - Log - commit 4ae5993cab1b1c42cfc99180c00ae0a235ce940c Author: Andy PolyakovDate: Thu May 4 15:54:29 2017 +0200 perlasm/x86_64-xlate.pl: work around problem with hex constants in masm. Perl, multiple versions, for some reason occasionally takes issue with letter b[?] in ox([0-9a-f]+) regex. As result some constants, such as 0xb1 came out wrong when generating code for MASM. Fixes GH#3241. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3385) (cherry picked from commit c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29) --- Summary of changes: crypto/perlasm/x86_64-xlate.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index 625f95c..d19195e 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -206,8 +206,9 @@ my %globals; } sprintf "\$%s",$self->{value}; } else { - $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm); - sprintf "%s",$self->{value}; + my $value = $self->{value}; + $value =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm); + sprintf "%s",$value; } } } _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
The branch OpenSSL_1_1_0-stable has been updated via fc925f3bd24cfe64976c57e941eea373dee92fe1 (commit) from 46824b30deab8fce5466eab9ae7e0f65867c6b1e (commit) - Log - commit fc925f3bd24cfe64976c57e941eea373dee92fe1 Author: Andy PolyakovDate: Thu May 4 15:54:29 2017 +0200 perlasm/x86_64-xlate.pl: work around problem with hex constants in masm. Perl, multiple versions, for some reason occasionally takes issue with letter b[?] in ox([0-9a-f]+) regex. As result some constants, such as 0xb1 came out wrong when generating code for MASM. Fixes GH#3241. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3385) (cherry picked from commit c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29) --- Summary of changes: crypto/perlasm/x86_64-xlate.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index 425cd29..6eaefcf 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -217,8 +217,9 @@ my %globals; } sprintf "\$%s",$self->{value}; } else { - $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm); - sprintf "%s",$self->{value}; + my $value = $self->{value}; + $value =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm); + sprintf "%s",$value; } } } _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
The branch OpenSSL_1_1_0-stable has been updated via 735c6269775ee44459227b4fade67a3f35e98cab (commit) from fc925f3bd24cfe64976c57e941eea373dee92fe1 (commit) - Log - commit 735c6269775ee44459227b4fade67a3f35e98cab Author: Andy PolyakovDate: Tue May 2 10:50:58 2017 +0200 sha/sha512.c: fix formatting. Reviewed-by: Richard Levitte (cherry picked from commit ce1932f25f784bc5df3505c5de8b6b53436202a3) --- Summary of changes: crypto/sha/sha512.c | 70 - 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c index d24d103..e94de43 100644 --- a/crypto/sha/sha512.c +++ b/crypto/sha/sha512.c @@ -143,7 +143,7 @@ int SHA512_Final(unsigned char *md, SHA512_CTX *c) return 0; switch (c->md_len) { -/* Let compiler decide if it's appropriate to unroll... */ +/* Let compiler decide if it's appropriate to unroll... */ case SHA384_DIGEST_LENGTH: for (n = 0; n < SHA384_DIGEST_LENGTH / 8; n++) { SHA_LONG64 t = c->h[n]; @@ -172,7 +172,7 @@ int SHA512_Final(unsigned char *md, SHA512_CTX *c) *(md++) = (unsigned char)(t); } break; -/* ... as well as make sure md_len is not abused. */ +/* ... as well as make sure md_len is not abused. */ default: return 0; } @@ -219,12 +219,12 @@ int SHA512_Update(SHA512_CTX *c, const void *_data, size_t len) if ((size_t)data % sizeof(c->u.d[0]) != 0) while (len >= sizeof(c->u)) memcpy(p, data, sizeof(c->u)), -sha512_block_data_order(c, p, 1), -len -= sizeof(c->u), data += sizeof(c->u); +sha512_block_data_order(c, p, 1), +len -= sizeof(c->u), data += sizeof(c->u); else #endif sha512_block_data_order(c, data, len / sizeof(c->u)), -data += len, len %= sizeof(c->u), data -= len; +data += len, len %= sizeof(c->u), data -= len; } if (len != 0) @@ -320,9 +320,10 @@ static const SHA_LONG64 K512[80] = { }; # ifndef PEDANTIC -# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) +# if defined(__GNUC__) && __GNUC__>=2 && \ + !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) # if defined(__x86_64) || defined(__x86_64__) -#define ROTR(a,n)({ SHA_LONG64 ret; \ +#define ROTR(a,n)({ SHA_LONG64 ret; \ asm ("rorq %1,%0" \ : "=r"(ret) \ : "J"(n),"0"(a) \ @@ -336,37 +337,37 @@ static const SHA_LONG64 K512[80] = { # elif (defined(__i386) || defined(__i386__)) && !defined(B_ENDIAN) #if defined(I386_ONLY) # define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\ - unsigned int hi=p[0],lo=p[1]; \ + unsigned int hi=p[0],lo=p[1]; \ asm("xchgb %%ah,%%al;xchgb %%dh,%%dl;"\ "roll $16,%%eax; roll $16,%%edx; "\ -"xchgb %%ah,%%al;xchgb %%dh,%%dl;" \ +"xchgb %%ah,%%al;xchgb %%dh,%%dl;"\ : "=a"(lo),"=d"(hi) \ : "0"(lo),"1"(hi) : "cc"); \ ((SHA_LONG64)hi)<<32|lo;}) #else # define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\ - unsigned int hi=p[0],lo=p[1]; \ + unsigned int hi=p[0],lo=p[1]; \ asm ("bswapl %0; bswapl %1;"\ : "=r"(lo),"=r"(hi) \ : "0"(lo),"1"(hi)); \ ((SHA_LONG64)hi)<<32|lo;}) #endif # elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64) -#define ROTR(a,n)({ SHA_LONG64 ret; \ +#define ROTR(a,n)({ SHA_LONG64 ret; \ asm ("rotrdi %0,%1,%2" \ : "=r"(ret) \ : "r"(a),"K"(n)); ret; }) # elif defined(__aarch64__) -#define ROTR(a,n)({ SHA_LONG64 ret; \ +#define ROTR(a,n)({ SHA_LONG64 ret; \ asm ("ror %0,%1,%2" \ : "=r"(ret) \ : "r"(a),"I"(n)); ret;
[openssl-commits] [openssl] master update
The branch master has been updated via c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29 (commit) from c0b4ff16755c5ced1bde62dd34f9df0ab8967f12 (commit) - Log - commit c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29 Author: Andy PolyakovDate: Thu May 4 15:54:29 2017 +0200 perlasm/x86_64-xlate.pl: work around problem with hex constants in masm. Perl, multiple versions, for some reason occasionally takes issue with letter b[?] in ox([0-9a-f]+) regex. As result some constants, such as 0xb1 came out wrong when generating code for MASM. Fixes GH#3241. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3385) --- Summary of changes: crypto/perlasm/x86_64-xlate.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl index b612c21..645be91 100755 --- a/crypto/perlasm/x86_64-xlate.pl +++ b/crypto/perlasm/x86_64-xlate.pl @@ -212,8 +212,9 @@ my %globals; } sprintf "\$%s",$self->{value}; } else { - $self->{value} =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm); - sprintf "%s",$self->{value}; + my $value = $self->{value}; + $value =~ s/0x([0-9a-f]+)/0$1h/ig if ($masm); + sprintf "%s",$value; } } } _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] master update
The branch master has been updated via ce1932f25f784bc5df3505c5de8b6b53436202a3 (commit) from c47aea8af1e28e46e1ad5e2e7468b49fec3f4f29 (commit) - Log - commit ce1932f25f784bc5df3505c5de8b6b53436202a3 Author: Andy PolyakovDate: Tue May 2 10:50:58 2017 +0200 sha/sha512.c: fix formatting. Reviewed-by: Richard Levitte --- Summary of changes: crypto/sha/sha512.c | 70 - 1 file changed, 42 insertions(+), 28 deletions(-) diff --git a/crypto/sha/sha512.c b/crypto/sha/sha512.c index d24d103..e94de43 100644 --- a/crypto/sha/sha512.c +++ b/crypto/sha/sha512.c @@ -143,7 +143,7 @@ int SHA512_Final(unsigned char *md, SHA512_CTX *c) return 0; switch (c->md_len) { -/* Let compiler decide if it's appropriate to unroll... */ +/* Let compiler decide if it's appropriate to unroll... */ case SHA384_DIGEST_LENGTH: for (n = 0; n < SHA384_DIGEST_LENGTH / 8; n++) { SHA_LONG64 t = c->h[n]; @@ -172,7 +172,7 @@ int SHA512_Final(unsigned char *md, SHA512_CTX *c) *(md++) = (unsigned char)(t); } break; -/* ... as well as make sure md_len is not abused. */ +/* ... as well as make sure md_len is not abused. */ default: return 0; } @@ -219,12 +219,12 @@ int SHA512_Update(SHA512_CTX *c, const void *_data, size_t len) if ((size_t)data % sizeof(c->u.d[0]) != 0) while (len >= sizeof(c->u)) memcpy(p, data, sizeof(c->u)), -sha512_block_data_order(c, p, 1), -len -= sizeof(c->u), data += sizeof(c->u); +sha512_block_data_order(c, p, 1), +len -= sizeof(c->u), data += sizeof(c->u); else #endif sha512_block_data_order(c, data, len / sizeof(c->u)), -data += len, len %= sizeof(c->u), data -= len; +data += len, len %= sizeof(c->u), data -= len; } if (len != 0) @@ -320,9 +320,10 @@ static const SHA_LONG64 K512[80] = { }; # ifndef PEDANTIC -# if defined(__GNUC__) && __GNUC__>=2 && !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) +# if defined(__GNUC__) && __GNUC__>=2 && \ + !defined(OPENSSL_NO_ASM) && !defined(OPENSSL_NO_INLINE_ASM) # if defined(__x86_64) || defined(__x86_64__) -#define ROTR(a,n)({ SHA_LONG64 ret; \ +#define ROTR(a,n)({ SHA_LONG64 ret; \ asm ("rorq %1,%0" \ : "=r"(ret) \ : "J"(n),"0"(a) \ @@ -336,37 +337,37 @@ static const SHA_LONG64 K512[80] = { # elif (defined(__i386) || defined(__i386__)) && !defined(B_ENDIAN) #if defined(I386_ONLY) # define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\ - unsigned int hi=p[0],lo=p[1]; \ + unsigned int hi=p[0],lo=p[1]; \ asm("xchgb %%ah,%%al;xchgb %%dh,%%dl;"\ "roll $16,%%eax; roll $16,%%edx; "\ -"xchgb %%ah,%%al;xchgb %%dh,%%dl;" \ +"xchgb %%ah,%%al;xchgb %%dh,%%dl;"\ : "=a"(lo),"=d"(hi) \ : "0"(lo),"1"(hi) : "cc"); \ ((SHA_LONG64)hi)<<32|lo;}) #else # define PULL64(x) ({ const unsigned int *p=(const unsigned int *)(&(x));\ - unsigned int hi=p[0],lo=p[1]; \ + unsigned int hi=p[0],lo=p[1]; \ asm ("bswapl %0; bswapl %1;"\ : "=r"(lo),"=r"(hi) \ : "0"(lo),"1"(hi)); \ ((SHA_LONG64)hi)<<32|lo;}) #endif # elif (defined(_ARCH_PPC) && defined(__64BIT__)) || defined(_ARCH_PPC64) -#define ROTR(a,n)({ SHA_LONG64 ret; \ +#define ROTR(a,n)({ SHA_LONG64 ret; \ asm ("rotrdi %0,%1,%2" \ : "=r"(ret) \ : "r"(a),"K"(n)); ret; }) # elif defined(__aarch64__) -#define ROTR(a,n)({ SHA_LONG64 ret; \ +#define ROTR(a,n)({ SHA_LONG64 ret; \ asm ("ror %0,%1,%2" \ : "=r"(ret) \ : "r"(a),"I"(n)); ret; }) #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \
[openssl-commits] Build failed: openssl master.10153
Build openssl master.10153 failed Commit e97d006cef by Neel Goyal on 5/4/2017 4:51 PM: [openssl/master] Add SSL_SESSION_dup with docs Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] master update
The branch master has been updated via 2db85ac97a5dda90249f5e630e7b29c4196fc397 (commit) from ce1932f25f784bc5df3505c5de8b6b53436202a3 (commit) - Log - commit 2db85ac97a5dda90249f5e630e7b29c4196fc397 Author: PauliDate: Fri Apr 28 14:06:11 2017 +1000 Conversion of the EC tests to use the framework. Some refactoring done as well. The prime_field_tests() function needs splitting and refactoring still. Reviewed-by: Rich Salz Reviewed-by: Andy Polyakov Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3340) --- Summary of changes: test/build.info |2 +- test/ectest.c | 2452 +-- 2 files changed, 1103 insertions(+), 1351 deletions(-) diff --git a/test/build.info b/test/build.info index b533db3..94a7402 100644 --- a/test/build.info +++ b/test/build.info @@ -67,7 +67,7 @@ INCLUDE_MAIN___test_libtestutil_OLB = /INCLUDE=MAIN SOURCE[ectest]=ectest.c INCLUDE[ectest]=.. ../include - DEPEND[ectest]=../libcrypto + DEPEND[ectest]=../libcrypto libtestutil.a SOURCE[ecdsatest]=ecdsatest.c INCLUDE[ecdsatest]=../include diff --git a/test/ectest.c b/test/ectest.c index bb2a08d..c057bd9 100644 --- a/test/ectest.c +++ b/test/ectest.c @@ -1,5 +1,5 @@ /* - * Copyright 2001-2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2001-2017 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -21,21 +21,10 @@ * */ -#include -#include -#include -#include - #include "e_os.h" +#include "testutil.h" -#ifdef OPENSSL_NO_EC -int main(int argc, char *argv[]) -{ -puts("Elliptic curves are disabled."); -return 0; -} -#else - +#ifndef OPENSSL_NO_EC # include # ifndef OPENSSL_NO_ENGINE # include @@ -52,114 +41,80 @@ int main(int argc, char *argv[]) # pragma warning(disable:4959) # endif -# define ABORT do { \ -fflush(stdout); \ -fprintf(stderr, "%s:%d: ABORT\n", __FILE__, __LINE__); \ -ERR_print_errors_fp(stderr); \ -EXIT(1); \ -} while (0) - -# define TIMING_BASE_PT 0 -# define TIMING_RAND_PT 1 -# define TIMING_SIMUL 2 +static size_t crv_len = 0; +static EC_builtin_curve *curves = NULL; /* test multiplication with group order, long and negative scalars */ -static void group_order_tests(EC_GROUP *group) +static int group_order_tests(EC_GROUP *group) { -BIGNUM *n1, *n2, *order; -EC_POINT *P = EC_POINT_new(group); -EC_POINT *Q = EC_POINT_new(group); -EC_POINT *R = EC_POINT_new(group); -EC_POINT *S = EC_POINT_new(group); -BN_CTX *ctx = BN_CTX_new(); -int i; - -n1 = BN_new(); -n2 = BN_new(); -order = BN_new(); -fprintf(stdout, "verify group order ..."); -fflush(stdout); -if (!EC_GROUP_get_order(group, order, ctx)) -ABORT; -if (!EC_POINT_mul(group, Q, order, NULL, NULL, ctx)) -ABORT; -if (!EC_POINT_is_at_infinity(group, Q)) -ABORT; -fprintf(stdout, "."); -fflush(stdout); -if (!EC_GROUP_precompute_mult(group, ctx)) -ABORT; -if (!EC_POINT_mul(group, Q, order, NULL, NULL, ctx)) -ABORT; -if (!EC_POINT_is_at_infinity(group, Q)) -ABORT; -fprintf(stdout, " ok\n"); -fprintf(stdout, "long/negative scalar tests "); +BIGNUM *n1 = NULL, *n2 = NULL, *order = NULL; +EC_POINT *P = NULL, *Q = NULL, *R = NULL, *S = NULL; +BN_CTX *ctx = NULL; +int i = 0, r = 0; + +if (!TEST_ptr(n1 = BN_new()) +|| !TEST_ptr(n2 = BN_new()) +|| !TEST_ptr(order = BN_new()) +|| !TEST_ptr(ctx = BN_CTX_new()) +|| !TEST_ptr(P = EC_POINT_new(group)) +|| !TEST_ptr(Q = EC_POINT_new(group)) +|| !TEST_ptr(R = EC_POINT_new(group)) +|| !TEST_ptr(S = EC_POINT_new(group))) +goto err; + +if (!TEST_true(EC_GROUP_get_order(group, order, ctx)) +|| !TEST_true(EC_POINT_mul(group, Q, order, NULL, NULL, ctx)) +|| !TEST_true(EC_POINT_is_at_infinity(group, Q)) +|| !TEST_true(EC_GROUP_precompute_mult(group, ctx)) +|| !TEST_true(EC_POINT_mul(group, Q, order, NULL, NULL, ctx)) +|| !TEST_true(EC_POINT_is_at_infinity(group, Q))) +goto err; + for (i = 1; i <= 2; i++) { const BIGNUM *scalars[6]; const EC_POINT *points[6]; -fprintf(stdout, i == 1 ? -"allowing precomputation ... " : -"without precomputation ... "); -if (!BN_set_word(n1, i)) -ABORT; -/* - * If i == 1, P will be the predefined generator for which - *
[openssl-commits] Build failed: openssl master.10165
Build openssl master.10165 failed Commit c4120646ee by Rich Salz on 5/5/2017 5:14 PM: Rationalize declaratoin of ERR_load_XXX_strings Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build completed: openssl master.10169
Build openssl master.10169 completed Commit ecdbe4ea1b by Rich Salz on 5/5/2017 9:39 PM: Convert shlibloadtest to new framework Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build failed: openssl 1.0.41
Build openssl 1.0.41 failed Commit 50afdd8cfe by Richard Levitte on 5/5/2017 9:08 PM: Rearrange test/recipes/95-test_*.t to use skip_all Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build failed: openssl master.10168
Build openssl master.10168 failed Commit e858a82e58 by Rich Salz on 5/5/2017 9:39 PM: Convert shlibloadtest to new framework Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build failed: openssl 1.0.42
Build openssl 1.0.42 failed Commit 73a4e30c9a by Richard Levitte on 5/5/2017 9:10 PM: Rearrange test/recipes/95-test_*.t to use skip_all Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] master update
The branch master has been updated via b83ace316282f05d8507561cc8129ec8491caade (commit) from 2db85ac97a5dda90249f5e630e7b29c4196fc397 (commit) - Log - commit b83ace316282f05d8507561cc8129ec8491caade Author: Richard LevitteDate: Fri May 5 23:08:55 2017 +0200 Rearrange test/recipes/95-test_*.t to use skip_all The conditions to skip these recipes entirely don't show in a non-verbose test harness output. We prefer to know, so use skip_all, as it is a little bit more verbose. [extended tests] Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3398) --- Summary of changes: test/recipes/95-test_external_boringssl.t | 1 - test/recipes/95-test_external_krb5.t | 14 ++ test/recipes/95-test_external_pyca.t | 20 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/test/recipes/95-test_external_boringssl.t b/test/recipes/95-test_external_boringssl.t index 56505cf..5e3f67e 100644 --- a/test/recipes/95-test_external_boringssl.t +++ b/test/recipes/95-test_external_boringssl.t @@ -15,7 +15,6 @@ setup("test_external_boringssl"); plan skip_all => "No external tests in this configuration" if disabled("external-tests"); - plan skip_all => "BoringSSL runner not detected" if !$ENV{BORING_RUNNER_DIR}; diff --git a/test/recipes/95-test_external_krb5.t b/test/recipes/95-test_external_krb5.t index 9981354..8cfec82 100644 --- a/test/recipes/95-test_external_krb5.t +++ b/test/recipes/95-test_external_krb5.t @@ -13,13 +13,11 @@ use OpenSSL::Test qw/:DEFAULT data_file srctop_file/; setup("test_external_krb5"); -plan tests => 1; +plan skip_all "No external tests in this configuration" +if disabled("external-tests"); +plan skip_all "krb5 not available" +if ! -f srctop_file("krb5", "README"); -SKIP: { -skip "No external tests in this configuration", 1 -if disabled("external-tests"); -skip "krb5 not available", 1 -if ! -f srctop_file("krb5", "README"); +plan tests => 1; -ok(run(cmd([data_file("krb5.sh")])), "running krb5 tests"); -} +ok(run(cmd([data_file("krb5.sh")])), "running krb5 tests"); diff --git a/test/recipes/95-test_external_pyca.t b/test/recipes/95-test_external_pyca.t index a64afd0..45d6c1b 100644 --- a/test/recipes/95-test_external_pyca.t +++ b/test/recipes/95-test_external_pyca.t @@ -15,18 +15,14 @@ setup("test_external"); plan skip_all => "No external tests in this configuration" if disabled("external-tests"); +plan skip_all "PYCA tests not available on Windows or VMS" +if $^O =~ /^(VMS|MSWin32)$/; +plan skip_all "PYCA Cryptography not available" +if ! -f srctop_file("pyca-cryptography", "setup.py"); +plan skip_all "PYCA tests only available in a shared build" +if disabled("shared"); plan tests => 1; -SKIP: { -skip "PYCA Cryptography not available", 1 -if ! -f srctop_file("pyca-cryptography", "setup.py"); -skip "PYCA tests not available on Windows or VMS", 1 -if $^O =~ /^(VMS|MSWin32)$/; -skip "PYCA tests only available in a shared build", 1 -if disabled("shared"); - -ok(run(cmd(["sh", data_file("cryptography.sh")])), -"running Python Cryptography tests"); -} - +ok(run(cmd(["sh", data_file("cryptography.sh")])), + "running Python Cryptography tests"); _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build completed: openssl master.10166
Build openssl master.10166 completed Commit a680784410 by Rich Salz on 5/1/2017 12:38 AM: More feedback. Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build failed: openssl master.10167
Build openssl master.10167 failed Commit 59b4a44e7d by Richard Levitte on 5/5/2017 9:08 PM: Rearrange test/recipes/95-test_*.t to use skip_all Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits