VirtualBox

Ignore:
Timestamp:
Nov 2, 2022 7:40:16 AM (2 years ago)
Author:
vboxsync
Message:

libs: Switch to openssl-3.0.7, bugref:10317

Location:
trunk/src/libs/openssl-3.0.7
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/openssl-3.0.7

    • Property svn:mergeinfo

      •  

        old new  
        1515/vendor/openssl/3.0.2:150728-150729
        1616/vendor/openssl/3.0.3:151497-151729
        17 /vendor/openssl/current:147554-151496
         17/vendor/openssl/3.0.7:154371
         18/vendor/openssl/current:147554-154370

  • trunk/src/libs/openssl-3.0.7/providers/fips/fipsprov.c

    r95219 r97372  
    3636static OSSL_FUNC_provider_get_params_fn fips_get_params;
    3737static OSSL_FUNC_provider_query_operation_fn fips_query;
    38 
    39 /* Locale object accessor functions */
    40 #ifdef OPENSSL_SYS_MACOSX
    41 # include <xlocale.h>
    42 #else
    43 # include <locale.h>
    44 #endif
    45 
    46 #if defined OPENSSL_SYS_WINDOWS
    47 # define locale_t _locale_t
    48 # define freelocale _free_locale
    49 #endif
    50 static locale_t loc;
    51 
    52 static int fips_init_casecmp(void);
    53 static void fips_deinit_casecmp(void);
    5438
    5539#define ALGC(NAMES, FUNC, CHECK) { { NAMES, FIPS_DEFAULT_PROPERTIES, FUNC }, CHECK }
    … …  
    504488}
    505489
    506 void *ossl_c_locale() {
    507     return (void *)loc;
    508 }
    509 
    510 static int fips_init_casecmp(void) {
    511 # ifdef OPENSSL_SYS_WINDOWS
    512     loc = _create_locale(LC_COLLATE, "C");
    513 # else
    514     loc = newlocale(LC_COLLATE_MASK, "C", (locale_t) 0);
    515 # endif
    516     return (loc == (locale_t) 0) ? 0 : 1;
    517 }
    518 
    519 static void fips_deinit_casecmp(void) {
    520     freelocale(loc);
    521 }
    522 
    523490static void fips_teardown(void *provctx)
    524491{
    … …  
    533500     * so no need to destroy it here.
    534501     */
    535     fips_deinit_casecmp();
    536502    ossl_prov_ctx_free(provctx);
    537503}
    … …  
    583549    memset(&selftest_params, 0, sizeof(selftest_params));
    584550
    585     if (!fips_init_casecmp())
    586         return 0;
    587551    if (!ossl_prov_seeding_from_dispatch(in))
    588         return 0;
     552        goto err;
    589553    for (; in->function_id != 0; in++) {
    590554        /*

  • trunk/src/libs/openssl-3.0.7/providers/fips/self_test.c

    r95219 r97372  
    105105}
    106106
    107 #elif defined(__GNUC__)
     107#elif defined(__GNUC__) && !defined(_AIX)
    108108# undef DEP_INIT_ATTRIBUTE
    109109# undef DEP_FINI_ATTRIBUTE
    … …  
    115115# pragma fini(cleanup)
    116116
    117 #elif defined(_AIX)
     117#elif defined(_AIX) && !defined(__GNUC__)
    118118void _init(void);
    119119void _cleanup(void);

  • trunk/src/libs/openssl-3.0.7/providers/fips/self_test_data.inc

    r94404 r97372  
    12711271    ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_E, rsa_e),
    12721272    ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_D, rsa_d),
    1273     ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_FACTOR, rsa_p),
    1274     ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_FACTOR, rsa_q),
    1275     ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_EXPONENT, rsa_dp),
    1276     ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_EXPONENT, rsa_dq),
    1277     ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_COEFFICIENT, rsa_qInv),
     1273    ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_FACTOR1, rsa_p),
     1274    ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_FACTOR2, rsa_q),
     1275    ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_EXPONENT1, rsa_dp),
     1276    ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_EXPONENT2, rsa_dq),
     1277    ST_KAT_PARAM_BIGNUM(OSSL_PKEY_PARAM_RSA_COEFFICIENT1, rsa_qInv),
    12781278    ST_KAT_PARAM_END()
    12791279};

  • trunk/src/libs/openssl-3.0.7/providers/fips/self_test_kats.c

    r94320 r97372  
    11/*
    2  * Copyright 2019-2021 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2019-2022 The OpenSSL Project Authors. All Rights Reserved.
    33 *
    44 * Licensed under the Apache License 2.0 (the "License").  You may not use
    … …  
    7373
    7474    return EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc)
    75            && EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, t->iv_len, NULL)
     75           && (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, t->iv_len, NULL) > 0)
    7676           && (in_tag == NULL
    7777               || EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, t->tag_len,
    78                                       in_tag))
     78                                      in_tag) > 0)
    7979           && EVP_CipherInit_ex(ctx, NULL, NULL, t->key, t->iv, enc)
    8080           && EVP_CIPHER_CTX_set_padding(ctx, pad)
    … …  
    118118            unsigned char tag[16] = { 0 };
    119119
    120             if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, t->tag_len,
    121                                      tag)
     120            if (EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, t->tag_len,
     121                                     tag) <= 0
    122122                || memcmp(tag, t->tag, t->tag_len) != 0)
    123123                goto err;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette