AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-09-22 11:19:35 +03:00
Code Releases Activity

Merge pull request #344 from quantum5/openssl1.1

Browse Source 
OpenSSL 1.1 Port
This commit is contained in:
Daiyuu Nobori
2017-10-18 16:58:46 +09:00
committed by GitHub
parent 1b73778e3f 0746be43a2
commit acf49ad536
4 changed files with 183 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mayaqua/Encrypt.h
View File

@ -236,7 +236,14 @@ void RAND_Free_For_SoftEther();
// Macro
#define HASHED_DATA(p) (((UCHAR *)p) + 15)
// OpenSSL <1.1 Shims
#if OPENSSL_VERSION_NUMBER < 0x10100000L
# 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)
# define X509_get0_notAfter(x509) ((x509)->cert_info->validity->notAfter)
# define X509_get_serialNumber(x509) ((x509)->cert_info->serialNumber)
#endif
// Crypt context
struct CRYPT
@ -351,7 +358,7 @@ struct CIPHER
struct MD
{
char Name[MAX_PATH];
const struct env_md_st *Md;
const struct evp_md_st *Md;
struct hmac_ctx_st *Ctx;
UINT Size;
};
@ -471,7 +478,7 @@ void GetAllNameFromName(wchar_t *str, UINT size, NAME *name);
void GetAllNameFromNameEx(wchar_t *str, UINT size, NAME *name);
void GetAllNameFromXEx(wchar_t *str, UINT size, X *x);
void GetAllNameFromXExA(char *str, UINT size, X *x);
BUF *BigNumToBuf(BIGNUM *bn);
BUF *BigNumToBuf(const BIGNUM *bn);
BIGNUM *BinToBigNum(void *data, UINT size);
BIGNUM *BufToBigNum(BUF *b);
char *BigNumToStr(BIGNUM *bn);