|
|
@@ -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
|
|
|
{
|