mirror of
https://github.com/SoftEtherVPN/SoftEtherVPN.git
synced 2024-11-23 01:49:53 +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:
commit
da13915d1e
@ -239,8 +239,6 @@ void RAND_Free_For_SoftEther();
|
|||||||
|
|
||||||
// OpenSSL <1.1 Shims
|
// OpenSSL <1.1 Shims
|
||||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
#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_get0_RSA(obj) ((obj)->pkey.rsa)
|
||||||
# define EVP_PKEY_base_id(pkey) ((pkey)->type)
|
# define EVP_PKEY_base_id(pkey) ((pkey)->type)
|
||||||
# define X509_get0_notBefore(x509) ((x509)->cert_info->validity->notBefore)
|
# 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)
|
# define X509_get_serialNumber(x509) ((x509)->cert_info->serialNumber)
|
||||||
#endif
|
#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
|
// Crypt context
|
||||||
struct CRYPT
|
struct CRYPT
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user