Use accessors instead of reaching into the RSA struct am: eedfb29cdb am: 676444f63d
Original change: https://android-review.googlesource.com/c/platform/external/vboot_reference/+/2569310
Change-Id: I6d84d25db34b32f8fe4d1e1c6eb8b13ffd2caff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/host/lib/util_misc.c b/host/lib/util_misc.c
index e75251e..ac0b3ea 100644
--- a/host/lib/util_misc.c
+++ b/host/lib/util_misc.c
@@ -29,7 +29,7 @@
free(digest);
}
-int vb_keyb_from_rsa(struct rsa_st *rsa_private_key,
+int vb_keyb_from_rsa(RSA *rsa_private_key,
uint8_t **keyb_data, uint32_t *keyb_size)
{
uint32_t i, nwords;
@@ -46,7 +46,7 @@
int retval = 1;
/* Size of RSA key in 32-bit words */
- nwords = BN_num_bits(rsa_private_key->n) / 32;
+ nwords = RSA_bits(rsa_private_key) / 32;
bufsize = (2 + nwords + nwords) * sizeof(uint32_t);
outbuf = malloc(bufsize);
@@ -75,7 +75,7 @@
NEW_BIGNUM(B);
#undef NEW_BIGNUM
- BN_copy(N, rsa_private_key->n);
+ BN_copy(N, RSA_get0_n(rsa_private_key));
BN_set_word(Big1, 1L);
BN_set_word(Big2, 2L);
BN_set_word(Big32, 32L);