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/stack.h

    r91772 r94082  
    11/*
    2  * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
     2 * Copyright 1995-2021 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_STACK_H
    11 # define HEADER_STACK_H
     10#ifndef OPENSSL_STACK_H
     11# define OPENSSL_STACK_H
     12# pragma once
     13
     14# include <openssl/macros.h>
     15# ifndef OPENSSL_NO_DEPRECATED_3_0
     16#  define HEADER_STACK_H
     17# endif
    1218
    1319#ifdef  __cplusplus
     
    4046int OPENSSL_sk_find(OPENSSL_STACK *st, const void *data);
    4147int OPENSSL_sk_find_ex(OPENSSL_STACK *st, const void *data);
     48int OPENSSL_sk_find_all(OPENSSL_STACK *st, const void *data, int *pnum);
    4249int OPENSSL_sk_push(OPENSSL_STACK *st, const void *data);
    4350int OPENSSL_sk_unshift(OPENSSL_STACK *st, const void *data);
     
    5158int OPENSSL_sk_is_sorted(const OPENSSL_STACK *st);
    5259
    53 # if OPENSSL_API_COMPAT < 0x10100000L
     60# ifndef OPENSSL_NO_DEPRECATED_1_1_0
    5461#  define _STACK OPENSSL_STACK
    5562#  define sk_num OPENSSL_sk_num
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