Skip to content

Update mtproto-utils.c #146

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
funwaa wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update mtproto-utils.c #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26fea35
Update mtproto-utils.c
funwaa Oct 1, 2019
360aa27
Update rsa_pem_openssl.c
funwaa Oct 1, 2019
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
26 changes: 24 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,18 +36,40 @@ TGLC_WRAPPER_ASSOC(rsa,RSA)
// TODO: Refactor crucial struct-identity into its own header.
TGLC_WRAPPER_ASSOC(bn,BIGNUM)

#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 ());
TGLC_bn_set_word (wrap_bn (ret->e), e);
ret->n = unwrap_bn (TGLC_bn_bin2bn (n, n_bytes, NULL));
return wrap_rsa (ret);
}

#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 +82,4 @@ TGLC_rsa *TGLC_pem_read_RSAPublicKey (FILE *fp) {
return wrap_rsa (PEM_read_RSAPublicKey (fp, NULL, NULL, NULL));
}

#endif
#endif // TGL_AVOID_OPENSSL
4 changes: 2 additions & 2 deletions mtproto-utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static unsigned long long BN2ull (TGLC_bn *b) {
if (sizeof (unsigned long) == 8) {
return TGLC_bn_get_word (b);
} else if (sizeof (unsigned long long) == 8) {
assert (0); // As long as nobody ever uses this code, assume it is broken.
//assert (0); // As long as nobody ever uses this code, assume it is broken.
unsigned long long tmp;
/* Here be dragons, but it should be okay due to be64toh */
TGLC_bn_bn2bin (b, (unsigned char *) &tmp);
Expand All @@ -112,7 +112,7 @@ static void ull2BN (TGLC_bn *b, unsigned long long val) {
if (sizeof (unsigned long) == 8 || val < (1ll << 32)) {
TGLC_bn_set_word (b, val);
} else if (sizeof (unsigned long long) == 8) {
assert (0); // As long as nobody ever uses this code, assume it is broken.
//assert (0); // As long as nobody ever uses this code, assume it is broken.
htobe64(val);
/* Here be dragons, but it should be okay due to htobe64 */
TGLC_bn_bin2bn ((unsigned char *) &val, 8, b);
Expand Down