aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2023-04-28 23:26:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-04-28 23:26:54 +0000
commit6a91e5f2d53c2857cfbe9918d431ade2292267b7 (patch)
treefe5b7bb8eb26c60f4d5622114a378eb8c5cc671d
parent3c96eac3b46184649a0922624f918fb4a9d19fc9 (diff)
parent5e21eb91fcb3c6c69e088ad350c4852f80dad2e2 (diff)
downloadvboot_reference-6a91e5f2d53c2857cfbe9918d431ade2292267b7.tar.gz
Use accessors instead of reaching into the RSA struct am: eedfb29cdb am: 676444f63d am: 1a9a8fe32a am: 5e21eb91fc
Original change: https://android-review.googlesource.com/c/platform/external/vboot_reference/+/2569310 Change-Id: I28a17c06245c6cc588b5dcd16bcee10821871724 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--host/lib/util_misc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/util_misc.c b/host/lib/util_misc.c
index e75251e6..ac0b3ea5 100644
--- a/host/lib/util_misc.c
+++ b/host/lib/util_misc.c
@@ -29,7 +29,7 @@ void PrintPubKeySha1Sum(VbPublicKey *key)
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 vb_keyb_from_rsa(struct rsa_st *rsa_private_key,
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 @@ int vb_keyb_from_rsa(struct rsa_st *rsa_private_key,
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);