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:
2 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/ssl/t1_enc.c

    r94404 r97372  
    394394    if (EVP_CIPHER_get_mode(c) == EVP_CIPH_GCM_MODE) {
    395395        if (!EVP_CipherInit_ex(dd, c, NULL, key, NULL, (which & SSL3_CC_WRITE))
    396             || !EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_GCM_SET_IV_FIXED, (int)k,
    397                                     iv)) {
     396            || EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_GCM_SET_IV_FIXED, (int)k,
     397                                    iv) <= 0) {
    398398            SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
    399399            goto err;
    … …  
    407407            taglen = EVP_CCM_TLS_TAG_LEN;
    408408        if (!EVP_CipherInit_ex(dd, c, NULL, NULL, NULL, (which & SSL3_CC_WRITE))
    409             || !EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_AEAD_SET_IVLEN, 12, NULL)
    410             || !EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_AEAD_SET_TAG, taglen, NULL)
    411             || !EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_CCM_SET_IV_FIXED, (int)k, iv)
     409            || (EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_AEAD_SET_IVLEN, 12, NULL) <= 0)
     410            || (EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_AEAD_SET_TAG, taglen, NULL) <= 0)
     411            || (EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_CCM_SET_IV_FIXED, (int)k, iv) <= 0)
    412412            || !EVP_CipherInit_ex(dd, NULL, NULL, key, NULL, -1)) {
    413413            SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
    … …  
    423423    if ((EVP_CIPHER_get_flags(c) & EVP_CIPH_FLAG_AEAD_CIPHER)
    424424        && *mac_secret_size
    425         && !EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_AEAD_SET_MAC_KEY,
    426                                 (int)*mac_secret_size, mac_secret)) {
     425        && EVP_CIPHER_CTX_ctrl(dd, EVP_CTRL_AEAD_SET_MAC_KEY,
     426                                (int)*mac_secret_size, mac_secret) <= 0) {
    427427        SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR);
    428428        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