fixes #4149 (OpenSSL: switch to OpenSSL 3.x)

1 files changed, 12 insertions, 5 deletions

diff --git a/include/openssl/stack.h b/include/openssl/stack.h
index b429d4e1bf..292d5a6968 100644
--- a/include/openssl/stack.h
+++ b/include/openssl/stack.h
@@ -1,14 +1,20 @@
 /*

- * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.

  *

- * Licensed under the OpenSSL license (the "License").  You may not use

+ * Licensed under the Apache License 2.0 (the "License").  You may not use

  * this file except in compliance with the License.  You can obtain a copy

  * in the file LICENSE in the source distribution or at

  * https://www.openssl.org/source/license.html

  */

 

-#ifndef HEADER_STACK_H

-# define HEADER_STACK_H

+#ifndef OPENSSL_STACK_H

+# define OPENSSL_STACK_H

+# pragma once

+

+# include <openssl/macros.h>

+# ifndef OPENSSL_NO_DEPRECATED_3_0

+#  define HEADER_STACK_H

+# endif

 

 #ifdef  __cplusplus

 extern "C" {

@@ -39,6 +45,7 @@ void *OPENSSL_sk_delete(OPENSSL_STACK *st, int loc);
 void *OPENSSL_sk_delete_ptr(OPENSSL_STACK *st, const void *p);

 int OPENSSL_sk_find(OPENSSL_STACK *st, const void *data);

 int OPENSSL_sk_find_ex(OPENSSL_STACK *st, const void *data);

+int OPENSSL_sk_find_all(OPENSSL_STACK *st, const void *data, int *pnum);

 int OPENSSL_sk_push(OPENSSL_STACK *st, const void *data);

 int OPENSSL_sk_unshift(OPENSSL_STACK *st, const void *data);

 void *OPENSSL_sk_shift(OPENSSL_STACK *st);

@@ -50,7 +57,7 @@ OPENSSL_STACK *OPENSSL_sk_dup(const OPENSSL_STACK *st);
 void OPENSSL_sk_sort(OPENSSL_STACK *st);

 int OPENSSL_sk_is_sorted(const OPENSSL_STACK *st);

 

-# if OPENSSL_API_COMPAT < 0x10100000L

+# ifndef OPENSSL_NO_DEPRECATED_1_1_0

 #  define _STACK OPENSSL_STACK

 #  define sk_num OPENSSL_sk_num

 #  define sk_value OPENSSL_sk_value