[openssl] OpenSSL_1_1_1-stable update

nic.tuv at gmail.com nic.tuv at gmail.com
Tue Jul 14 08:15:47 UTC 2020


The branch OpenSSL_1_1_1-stable has been updated
       via  a5b8c19cdab4e330af0377e2fa0fdd1de2f67d59 (commit)
      from  2688dfb077f32b45bfaff48bf88e82e18ddc9fe5 (commit)


- Log -----------------------------------------------------------------
commit a5b8c19cdab4e330af0377e2fa0fdd1de2f67d59
Author: Nicola Tuveri <nic.tuv at gmail.com>
Date:   Mon Jul 13 19:22:18 2020 +0300

    [1.1.1][test] Avoid missing EC_GROUP wrappers
    
    Backport of https://github.com/openssl/openssl/pull/12096 to 1.1.1 broke
    the build as the following functions are missing:
    
        const BIGNUM *EC_GROUP_get0_field(const EC_GROUP *group);
        int EC_GROUP_get_field_type(const EC_GROUP *group);
    
    Turns out that for the purposes of the test code, we don't really need
    to differentiate between prime and binary fields, and we can directly
    use the existing `EC_GROUP_get_degree()` in the same fashion as was
    being done for binary fields also for prime fields.
    
    Fixes https://github.com/openssl/openssl/issues/12432
    
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/12433)

-----------------------------------------------------------------------

Summary of changes:
 test/ectest.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/ectest.c b/test/ectest.c
index 43c8dfb303..d33285ae14 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -2123,9 +2123,7 @@ static int custom_generator_test(int id)
         goto err;
 
     /* expected byte length of encoded points */
-    bsize = (EC_GROUP_get_field_type(group) == NID_X9_62_prime_field) ?
-             BN_num_bytes(EC_GROUP_get0_field(group)) :
-             (EC_GROUP_get_degree(group) + 7) / 8;
+    bsize = (EC_GROUP_get_degree(group) + 7) / 8;
     bsize = 2 * bsize + 1;
 
     if (!TEST_ptr(k = BN_CTX_get(ctx))


More information about the openssl-commits mailing list