1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-12-25 17:49:52 +03:00

Merge pull request #804 from davidebeatrici/openbsd-aead-tag-macro-build-fix

Merge PR #804: Mayaqua/Encrypt.h: fix missing AEAD macro for OpenBSD
This commit is contained in:
Ilya Shipitsin 2018-11-09 00:23:19 +05:00 committed by GitHub
commit da13915d1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -239,8 +239,6 @@ void RAND_Free_For_SoftEther();
// OpenSSL <1.1 Shims
#if OPENSSL_VERSION_NUMBER < 0x10100000L
# define EVP_CTRL_AEAD_GET_TAG EVP_CTRL_GCM_GET_TAG
# define EVP_CTRL_AEAD_SET_TAG EVP_CTRL_GCM_SET_TAG
# define EVP_PKEY_get0_RSA(obj) ((obj)->pkey.rsa)
# define EVP_PKEY_base_id(pkey) ((pkey)->type)
# define X509_get0_notBefore(x509) ((x509)->cert_info->validity->notBefore)
@ -248,6 +246,14 @@ void RAND_Free_For_SoftEther();
# define X509_get_serialNumber(x509) ((x509)->cert_info->serialNumber)
#endif
#ifndef EVP_CTRL_AEAD_GET_TAG
# define EVP_CTRL_AEAD_GET_TAG EVP_CTRL_GCM_GET_TAG
#endif
#ifndef EVP_CTRL_AEAD_SET_TAG
# define EVP_CTRL_AEAD_SET_TAG EVP_CTRL_GCM_SET_TAG
#endif
// Crypt context
struct CRYPT
{