Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Repush of pull request #98 due to strawberry hickup. #100

Merged
merged 8 commits into from
Nov 21, 2018
Merged

Repush of pull request #98 due to strawberry hickup. #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3ecc020
Make use of RSA_generate_key_ex().
chincheta0815 Nov 8, 2018
7b2b5dc
Small typo.
chincheta0815 Nov 8, 2018
6774a40
Better comments.
chincheta0815 Nov 13, 2018
46cc1ae
RSA_generate_kex_ex(): add check for libreSSL
chincheta0815 Nov 20, 2018
5ccd85a
SSLeay.xs: add error handling for RSA_new, BN_new and BN_GENCB calls.
chincheta0815 Nov 20, 2018
360bf5f
Merge branch 'master' into RSA_generate_key_ex
chincheta0815 Nov 20, 2018
09321e9
Free more before calling croak.
h-vn Nov 20, 2018
f91e494
Updated Changes for RSA_generate_key update.
h-vn Nov 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
Revision history for Perl extension Net::SSLeay.

??????? 2018-??-??
- Net::SSLeay::RSA_generate_key() now prefers using
RSA_generate_key_ex. This avois deprecated RSA_generate_key
and allows removing the only Android specific code in
SSLeay.xs. Fixes RT#127593. Thanks to Rouven Weiler.

1.86_06 2018-09-29
- Net::SSLeay::read() and SSL_peek() now check SSL_get_error()
for SSL_ERROR_ZERO_RETURN for return values <= 0 to make
Expand Down
42 changes: 34 additions & 8 deletions SSLeay.xs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5744,7 +5744,7 @@ SSL_set_tmp_rsa(ssl,rsa)

#endif

#ifdef __ANDROID__
#if OPENSSL_VERSION_NUMBER >= 0x0090800fL

RSA *
RSA_generate_key(bits,ee,perl_cb=&PL_sv_undef,perl_data=&PL_sv_undef)
Expand All @@ -5755,24 +5755,50 @@ RSA_generate_key(bits,ee,perl_cb=&PL_sv_undef,perl_data=&PL_sv_undef)
PREINIT:
simple_cb_data_t* cb_data = NULL;
CODE:
/* Android does not have RSA_generate_key. This equivalent is contributed by Brian Fraser for Android */
/* but is not portable to old OpenSSLs where RSA_generate_key_ex is not available */
/* openssl 0.9.8 deprecated RSA_generate_key. */
/* This equivalent was contributed by Brian Fraser for Android, */
/* but was not portable to old OpenSSLs where RSA_generate_key_ex is not available. */
/* It should now be more versatile. */
/* as of openssl 1.1.0 it is not possible anymore to generate the BN_GENCB structure directly. */
/* instead BN_EGNCB_new() has to be used. */
int rc;
RSA * ret;
BIGNUM *e;
e = BN_new();
if(!e)
croak("Net::SSLeay: RSA_generate_key perl function could not create BN structure.\n");
BN_set_word(e, ee);
cb_data = simple_cb_data_new(perl_cb, perl_data);
BN_GENCB new_cb;
BN_GENCB_set_old(&new_cb, ssleay_RSA_generate_key_cb_invoke, cb_data);

ret = RSA_new();
if(!ret) {
simple_cb_data_free(cb_data);
BN_free(e);
croak("Net::SSLeay: RSA_generate_key perl function could not create RSA structure.\n");
}
#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
BN_GENCB *new_cb;
new_cb = BN_GENCB_new();
if(!new_cb) {
simple_cb_data_free(cb_data);
BN_free(e);
RSA_free(ret);
croak("Net::SSLeay: RSA_generate_key perl function could not create BN_GENCB structure.\n");
}
BN_GENCB_set_old(new_cb, ssleay_RSA_generate_key_cb_invoke, cb_data);
rc = RSA_generate_key_ex(ret, bits, e, new_cb);
BN_GENCB_free(new_cb);
#else
BN_GENCB new_cb;
BN_GENCB_set_old(&new_cb, ssleay_RSA_generate_key_cb_invoke, cb_data);
rc = RSA_generate_key_ex(ret, bits, e, &new_cb);

if (rc == -1 || ret == NULL)
croak("Couldn't generate RSA key");
#endif
simple_cb_data_free(cb_data);
BN_free(e);
if (rc == -1 || ret == NULL) {
if (ret) RSA_free(ret);
croak("Net::SSLeay: Couldn't generate RSA key");
}
e = NULL;
RETVAL = ret;
OUTPUT:
Expand Down