Skip to content

fixed https://github.com/vysheng/tgl/issues/129 #130

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

Open
matthiasbock wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed https://github.com/vysheng/tgl/issues/129 #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 31 additions & 2 deletions crypto/rsa_pem_openssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ TGLC_WRAPPER_ASSOC(rsa,RSA)
// TODO: Refactor crucial struct-identity into its own header.
TGLC_WRAPPER_ASSOC(bn,BIGNUM)

/*
* Since OpenSSL version 1.1.0 the RSA struct (rsa_st) is opaque,
* see also https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes
*/
#if (OPENSSL_VERSION_NUMBER < 0x10100000L)

TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) {
RSA *ret = RSA_new ();
ret->e = unwrap_bn (TGLC_bn_new ());
Expand All @@ -47,7 +53,30 @@ TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) {
#define RSA_GETTER(M) \
TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) { \
return wrap_bn (unwrap_rsa (key)->M); \
} \
}

#else // OPENSSL_VERSION_NUMBER

TGLC_rsa *TGLC_rsa_new (unsigned long e, int n_bytes, const unsigned char *n) {
RSA *ret = RSA_new ();
BIGNUM *ret_e = unwrap_bn (TGLC_bn_new ());
BIGNUM *ret_n = unwrap_bn (TGLC_bn_bin2bn (n, n_bytes, NULL));
RSA_set0_key (ret, ret_n, ret_e, NULL);
TGLC_bn_set_word (wrap_bn (ret_e), e);
return wrap_rsa (ret);
}

#define RSA_GETTER(M) \
TGLC_bn *TGLC_rsa_ ## M (TGLC_rsa *key) { \
BIGNUM *rsa_n, *rsa_e, *rsa_d; \
RSA_get0_key(unwrap_rsa (key), \
(const BIGNUM **) &rsa_n, \
(const BIGNUM **) &rsa_e, \
(const BIGNUM **) &rsa_d); \
return wrap_bn (rsa_ ## M); \
}

#endif // OPENSSL_VERSION_NUMBER

RSA_GETTER(n);
RSA_GETTER(e);
Expand All @@ -60,4 +89,4 @@ TGLC_rsa *TGLC_pem_read_RSAPublicKey (FILE *fp) {
return wrap_rsa (PEM_read_RSAPublicKey (fp, NULL, NULL, NULL));
}

#endif
#endif // TGL_AVOID_OPENSSL