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/include/openssl/buffer.h

    r91772 r94082  
    22 * Copyright 1995-2018 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
    … …  
    88 */
    99
    10 #ifndef HEADER_BUFFER_H
    11 # define HEADER_BUFFER_H
     10#ifndef OPENSSL_BUFFER_H
     11# define OPENSSL_BUFFER_H
     12# pragma once
    1213
    13 # include <openssl/ossl_typ.h>
    14 # ifndef HEADER_CRYPTO_H
     14# include <openssl/macros.h>
     15# ifndef OPENSSL_NO_DEPRECATED_3_0
     16#  define HEADER_BUFFER_H
     17# endif
     18
     19# include <openssl/types.h>
     20# ifndef OPENSSL_CRYPTO_H
    1521#  include <openssl/crypto.h>
    1622# endif
    … …  
    2531# include <sys/types.h>
    2632
    27 /*
    28  * These names are outdated as of OpenSSL 1.1; a future release
    29  * will move them to be deprecated.
    30  */
    31 # define BUF_strdup(s) OPENSSL_strdup(s)
    32 # define BUF_strndup(s, size) OPENSSL_strndup(s, size)
    33 # define BUF_memdup(data, size) OPENSSL_memdup(data, size)
    34 # define BUF_strlcpy(dst, src, size)  OPENSSL_strlcpy(dst, src, size)
    35 # define BUF_strlcat(dst, src, size) OPENSSL_strlcat(dst, src, size)
    36 # define BUF_strnlen(str, maxlen) OPENSSL_strnlen(str, maxlen)
     33# ifndef OPENSSL_NO_DEPRECATED_3_0
     34#  define BUF_strdup(s) OPENSSL_strdup(s)
     35#  define BUF_strndup(s, size) OPENSSL_strndup(s, size)
     36#  define BUF_memdup(data, size) OPENSSL_memdup(data, size)
     37#  define BUF_strlcpy(dst, src, size)  OPENSSL_strlcpy(dst, src, size)
     38#  define BUF_strlcat(dst, src, size) OPENSSL_strlcat(dst, src, size)
     39#  define BUF_strnlen(str, maxlen) OPENSSL_strnlen(str, maxlen)
     40# endif
    3741
    3842struct buf_mem_st {
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