uLab
/
xrdp-proprietary
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/xrdp-proprietary
0
0
Fork 0
Code Issues Releases Wiki Activity

Update for OpenSSL 1.1

Browse Source
ulab-original
Timothy Pearson 6 years ago
parent f142d944ab
commit 06e92f369a
1 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File

48
common/ssl_calls.c
Unescape View File

@ -185,10 +185,10 @@ ssl_mod_exp(char* out, int out_len, char* in, int in_len,
char* mod, int mod_len, char* exp, int exp_len) char* mod, int mod_len, char* exp, int exp_len)
{ {
BN_CTX* ctx; BN_CTX* ctx;
BIGNUM lmod; BIGNUM* lmod;
BIGNUM lexp; BIGNUM* lexp;
BIGNUM lin; BIGNUM* lin;
BIGNUM lout; BIGNUM* lout;
int rv; int rv;
char* l_out; char* l_out;
char* l_in; char* l_in;
@ -206,15 +206,15 @@ ssl_mod_exp(char* out, int out_len, char* in, int in_len,
ssl_reverse_it(l_mod, mod_len); ssl_reverse_it(l_mod, mod_len);
ssl_reverse_it(l_exp, exp_len); ssl_reverse_it(l_exp, exp_len);
ctx = BN_CTX_new(); ctx = BN_CTX_new();
BN_init(&lmod); lmod = BN_new();
BN_init(&lexp); lexp = BN_new();
BN_init(&lin); lin = BN_new();
BN_init(&lout); lout = BN_new();
BN_bin2bn((tui8*)l_mod, mod_len, &lmod); BN_bin2bn((tui8*)l_mod, mod_len, lmod);
BN_bin2bn((tui8*)l_exp, exp_len, &lexp); BN_bin2bn((tui8*)l_exp, exp_len, lexp);
BN_bin2bn((tui8*)l_in, in_len, &lin); BN_bin2bn((tui8*)l_in, in_len, lin);
BN_mod_exp(&lout, &lin, &lexp, &lmod, ctx); BN_mod_exp(lout, lin, lexp, lmod, ctx);
rv = BN_bn2bin(&lout, (tui8*)l_out); rv = BN_bn2bin(lout, (tui8*)l_out);
if (rv <= out_len) if (rv <= out_len)
{ {
ssl_reverse_it(l_out, rv); ssl_reverse_it(l_out, rv);
@ -224,10 +224,10 @@ ssl_mod_exp(char* out, int out_len, char* in, int in_len,
{ {
rv = 0; rv = 0;
} }
BN_free(&lin); BN_free(lin);
BN_free(&lout); BN_free(lout);
BN_free(&lexp); BN_free(lexp);
BN_free(&lmod); BN_free(lmod);
BN_CTX_free(ctx); BN_CTX_free(ctx);
g_free(l_out); g_free(l_out);
g_free(l_in); g_free(l_in);
@ -314,6 +314,8 @@ ssl_gen_key_xrdp1(int key_size_in_bits, char* exp, int exp_len,
char* lpri; char* lpri;
int error; int error;
int len; int len;
const BIGNUM* key_n;
const BIGNUM* key_d;
if ((exp_len != 4) || (mod_len != 64) || (pri_len != 64)) if ((exp_len != 4) || (mod_len != 64) || (pri_len != 64))
{ {
@ -330,22 +332,26 @@ ssl_gen_key_xrdp1(int key_size_in_bits, char* exp, int exp_len,
error = RSA_generate_key_ex(my_key, key_size_in_bits, my_e, 0) == 0; error = RSA_generate_key_ex(my_key, key_size_in_bits, my_e, 0) == 0;
if (error == 0) if (error == 0)
{ {
len = BN_num_bytes(my_key->n); RSA_get0_key(my_key, &key_n, NULL, &key_d);
}
if (error == 0)
{
len = BN_num_bytes(key_n);
error = len != mod_len; error = len != mod_len;
} }
if (error == 0) if (error == 0)
{ {
BN_bn2bin(my_key->n, (tui8*)lmod); BN_bn2bin(key_n, (tui8*)lmod);
ssl_reverse_it(lmod, mod_len); ssl_reverse_it(lmod, mod_len);
} }
if (error == 0) if (error == 0)
{ {
len = BN_num_bytes(my_key->d); len = BN_num_bytes(key_d);
error = len != pri_len; error = len != pri_len;
} }
if (error == 0) if (error == 0)
{ {
BN_bn2bin(my_key->d, (tui8*)lpri); BN_bn2bin(key_d, (tui8*)lpri);
ssl_reverse_it(lpri, pri_len); ssl_reverse_it(lpri, pri_len);
} }
if (error == 0) if (error == 0)

Write Preview
Loading…
Cancel
Save