diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2022-03-15 22:18:15 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2022-03-15 22:18:15 +0000 |
| commit | d6d3d400982465ee2c394caa850ba51c537b5a09 (patch) | |
| tree | b585b42a59bad0b1d2f9161d22da3b590692ea52 /include/openssl | |
| parent | 56eae1b760adf10835560a9ee595549a1f10410f (diff) | |
| download | src-d6d3d400982465ee2c394caa850ba51c537b5a09.tar.gz src-d6d3d400982465ee2c394caa850ba51c537b5a09.zip | |
Import OpenSSL 1.1.1nvendor/openssl/1.1.1n
Diffstat (limited to 'include/openssl')
| -rw-r--r-- | include/openssl/engine.h | 3 | ||||
| -rw-r--r-- | include/openssl/obj_mac.h | 2 | ||||
| -rw-r--r-- | include/openssl/opensslv.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/openssl/engine.h b/include/openssl/engine.h index 0780f0fb5f32..d707eaeb6ee3 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -1,5 +1,5 @@ /* - * Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved. * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved * * Licensed under the OpenSSL license (the "License"). You may not use @@ -722,6 +722,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id, CRYPTO_set_mem_functions(fns->mem_fns.malloc_fn, \ fns->mem_fns.realloc_fn, \ fns->mem_fns.free_fn); \ + OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL); \ skip_cbs: \ if (!fn(e, id)) return 0; \ return 1; } diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h index eb812ed18dcc..53516a06c69b 100644 --- a/include/openssl/obj_mac.h +++ b/include/openssl/obj_mac.h @@ -2,7 +2,7 @@ * WARNING: do not edit! * Generated by crypto/objects/objects.pl * - * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2000-2022 The OpenSSL Project Authors. All Rights Reserved. * Licensed under the OpenSSL license (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 diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index 261d7cb326cb..c48626447036 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -39,8 +39,8 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x101010dfL -# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1m 14 Dec 2021" +# define OPENSSL_VERSION_NUMBER 0x101010efL +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.1n 15 Mar 2022" /*- * The macros below are to be used for shared library (.so, .dll, ...) |