diff options
| author | Daiyuu Nobori <da.git@softether.co.jp> | 2017-10-18 10:58:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 10:58:09 +0300 |
| commit | f9436daa6f3d4b43f22379b0c8a2395e1c9c83b8 (patch) | |
| tree | e4ec5bddedd57606ca37995880332cb96adc1038 | |
| parent | 2241b9a366d9c67759adae02113c4b29109ec06f (diff) | |
| parent | a3db7b2e3dd748aaf6f5e9d81ba935b73b9b4cf3 (diff) | |
Merge pull request #313 from zulzardi/patch-2
Fixed RSA key bits wrong calculation for certain x509 certificate
| -rw-r--r-- | src/Mayaqua/Encrypt.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c index 21c178a6..75b12011 100644 --- a/src/Mayaqua/Encrypt.c +++ b/src/Mayaqua/Encrypt.c @@ -4096,14 +4096,22 @@ X *X509ToX(X509 *x509) type = k->pkey->type;
FreeBuf(b);
-
+
+ //Fixed to get actual RSA key bits
+ x->bits = EVP_PKEY_bits(k->pkey);
+
FreeK(k);
if (type == EVP_PKEY_RSA)
{
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:
x->bits = 1024;
@@ -4128,7 +4136,7 @@ X *X509ToX(X509 *x509) default:
x->is_compatible_bit = false;
break;
- }
+ }*/
}
return x;
|