forked from cory/tildefriends
OpenSSL 3.2.1, and some android SDK updates.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4821 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Generated by util/mkerr.pl DO NOT EDIT
|
||||
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
|
||||
* Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||
*
|
||||
* 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
|
||||
@ -38,6 +38,7 @@
|
||||
# define CONF_R_NUMBER_TOO_LARGE 121
|
||||
# define CONF_R_OPENSSL_CONF_REFERENCES_MISSING_SECTION 124
|
||||
# define CONF_R_RECURSIVE_DIRECTORY_INCLUDE 111
|
||||
# define CONF_R_RECURSIVE_SECTION_REFERENCE 126
|
||||
# define CONF_R_RELATIVE_PATH 125
|
||||
# define CONF_R_SSL_COMMAND_SECTION_EMPTY 117
|
||||
# define CONF_R_SSL_COMMAND_SECTION_NOT_FOUND 118
|
||||
|
@ -22,7 +22,15 @@
|
||||
*/
|
||||
|
||||
# if defined(OPENSSL_SYS_WINDOWS)
|
||||
# include <winsock2.h>
|
||||
# if !defined(_WINSOCKAPI_)
|
||||
/*
|
||||
* winsock2.h defines _WINSOCK2API_ and both winsock2.h and winsock.h define
|
||||
* _WINSOCKAPI_. Both of these provide struct timeval. Don't include
|
||||
* winsock2.h if either header has been included to avoid breakage with
|
||||
* applications that prefer to use <winsock.h> over <winsock2.h>.
|
||||
*/
|
||||
# include <winsock2.h>
|
||||
# endif
|
||||
# else
|
||||
# include <sys/time.h>
|
||||
# endif
|
||||
|
@ -29,7 +29,7 @@ extern "C" {
|
||||
*/
|
||||
# define OPENSSL_VERSION_MAJOR 3
|
||||
# define OPENSSL_VERSION_MINOR 2
|
||||
# define OPENSSL_VERSION_PATCH 0
|
||||
# define OPENSSL_VERSION_PATCH 1
|
||||
|
||||
/*
|
||||
* Additional version information
|
||||
@ -74,21 +74,21 @@ extern "C" {
|
||||
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
|
||||
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
|
||||
*/
|
||||
# define OPENSSL_VERSION_STR "3.2.0"
|
||||
# define OPENSSL_FULL_VERSION_STR "3.2.0"
|
||||
# define OPENSSL_VERSION_STR "3.2.1"
|
||||
# define OPENSSL_FULL_VERSION_STR "3.2.1"
|
||||
|
||||
/*
|
||||
* SECTION 3: ADDITIONAL METADATA
|
||||
*
|
||||
* These strings are defined separately to allow them to be parsable.
|
||||
*/
|
||||
# define OPENSSL_RELEASE_DATE "23 Nov 2023"
|
||||
# define OPENSSL_RELEASE_DATE "30 Jan 2024"
|
||||
|
||||
/*
|
||||
* SECTION 4: BACKWARD COMPATIBILITY
|
||||
*/
|
||||
|
||||
# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.0 23 Nov 2023"
|
||||
# define OPENSSL_VERSION_TEXT "OpenSSL 3.2.1 30 Jan 2024"
|
||||
|
||||
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
|
||||
# ifdef OPENSSL_VERSION_PRE_RELEASE
|
||||
|
Reference in New Issue
Block a user