VirtualBox

Ignore:
Timestamp:
Mar 3, 2022 7:17:34 PM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
150325
Message:

libs/openssl-3.0.1: started applying and adjusting our OpenSSL changes to 3.0.1. bugref:10128

Location:
trunk/src/libs/openssl-3.0.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/libs/openssl-3.0.1

    • Property svn:mergeinfo
      •  

        old new  
        1212/vendor/openssl/1.1.1c:131722-131725
        1313/vendor/openssl/1.1.1k:145841-145843
         14/vendor/openssl/3.0.1:150323-150324
         15/vendor/openssl/current:147554-150322
  • trunk/src/libs/openssl-3.0.1/crypto/ts/ts_req_utils.c

    r91772 r94082  
    11/*
    2  * Copyright 2006-2016 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
    33 *
    4  * Licensed under the OpenSSL license (the "License").  You may not use
     4 * Licensed under the Apache License 2.0 (the "License").  You may not use
    55 * this file except in compliance with the License.  You can obtain a copy
    66 * in the file LICENSE in the source distribution or at
     
    3333    new_msg_imprint = TS_MSG_IMPRINT_dup(msg_imprint);
    3434    if (new_msg_imprint == NULL) {
    35         TSerr(TS_F_TS_REQ_SET_MSG_IMPRINT, ERR_R_MALLOC_FAILURE);
     35        ERR_raise(ERR_LIB_TS, ERR_R_MALLOC_FAILURE);
    3636        return 0;
    3737    }
     
    5454    new_alg = X509_ALGOR_dup(alg);
    5555    if (new_alg == NULL) {
    56         TSerr(TS_F_TS_MSG_IMPRINT_SET_ALGO, ERR_R_MALLOC_FAILURE);
     56        ERR_raise(ERR_LIB_TS, ERR_R_MALLOC_FAILURE);
    5757        return 0;
    5858    }
     
    8585    new_policy = OBJ_dup(policy);
    8686    if (new_policy == NULL) {
    87         TSerr(TS_F_TS_REQ_SET_POLICY_ID, ERR_R_MALLOC_FAILURE);
     87        ERR_raise(ERR_LIB_TS, ERR_R_MALLOC_FAILURE);
    8888        return 0;
    8989    }
     
    106106    new_nonce = ASN1_INTEGER_dup(nonce);
    107107    if (new_nonce == NULL) {
    108         TSerr(TS_F_TS_REQ_SET_NONCE, ERR_R_MALLOC_FAILURE);
     108        ERR_raise(ERR_LIB_TS, ERR_R_MALLOC_FAILURE);
    109109        return 0;
    110110    }
Note: See TracChangeset for help on using the changeset viewer.

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