AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge pull request #313 from zulzardi/patch-2

Browse Source 
Fixed RSA key bits wrong calculation for certain x509 certificate
This commit is contained in:
Daiyuu Nobori 2017-10-18 16:58:09 +09:00 committed by GitHub
commit f9436daa6f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mayaqua/Encrypt.c
View File

@ -4096,14 +4096,22 @@ X *X509ToX(X509 *x509)
type = k->pkey->type; type = k->pkey->type;
FreeBuf(b); FreeBuf(b);
//Fixed to get actual RSA key bits
x->bits = EVP_PKEY_bits(k->pkey);
FreeK(k); FreeK(k);
if (type == EVP_PKEY_RSA) if (type == EVP_PKEY_RSA)
{ {
x->is_compatible_bit = true; x->is_compatible_bit = true;
switch (size) if(x->bits != 1024 && x->bits != 1536 && x->bits != 2048 && x->bits != 3072 && x->bits != 4096)
x->is_compatible_bit = false;
else
x->is_compatible_bit = true;
/*switch (size)
{ {
case 162: case 162:
x->bits = 1024; x->bits = 1024;
@ -4128,7 +4136,7 @@ X *X509ToX(X509 *x509)
default: default:
x->is_compatible_bit = false; x->is_compatible_bit = false;
break; break;
} }*/
} }
return x; return x;