diff options
| author | Daniel Kurtz <djkurtz@chromium.org> | 2017-06-30 11:45:08 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-07-07 00:57:17 -0700 |
| commit | bce7904376beee2912932433a4634c1c25afe2f5 (patch) | |
| tree | bba8df33dab5fb6d3c64b13ac3a290e8da03c780 /host/lib21 | |
| parent | 06beb42e11733670eb1894f12586443a37a5af7c (diff) | |
| download | vboot-bce7904376beee2912932433a4634c1c25afe2f5.tar.gz | |
Update for openssl 1.1
OpenSSL 1.1 has made significant non-backwards compatible changes to its
API as outlined in:
https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes
BRANCH=none
BUG=chromium:738114
TEST=cros_workon --host start vboot_reference
TEST=w/ openssl-1.0.2k: sudo emerge vboot_reference
TEST=w/ openssl-1.1.0e: sudo emerge vboot_reference
=> both build ok
$ futility version
=> command runs without error
TEST=cros_workon --board=soraka start vboot_reference coreboot
TEST=w/ openssl-1.0.2k: emerge-soraka vboot_reference coreboot
TEST=w/ openssl-1.1.0e: emerge-soraka vboot_reference coreboot
=> All build ok
Change-Id: I37cfc8cbb04a092eab7b0b3224f475b82609447c
Reviewed-on: https://chromium-review.googlesource.com/557739
Commit-Ready: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'host/lib21')
| -rw-r--r-- | host/lib21/host_key.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/host/lib21/host_key.c b/host/lib21/host_key.c index 4f82d10c..c0235b3b 100644 --- a/host/lib21/host_key.c +++ b/host/lib21/host_key.c @@ -17,6 +17,7 @@ #include "host_common.h" #include "host_key2.h" #include "host_misc.h" +#include "openssl_compat.h" const struct vb2_text_vs_enum vb2_text_vs_sig[] = { {"RSA1024", VB2_SIG_RSA1024}, @@ -565,8 +566,12 @@ int vb2_public_key_hash(struct vb2_public_key *key, enum vb2_signature_algorithm vb2_rsa_sig_alg(struct rsa_st *rsa) { - int exp = BN_get_word(rsa->e); - int bits = BN_num_bits(rsa->n); + const BIGNUM *e, *n; + int exp, bits; + + RSA_get0_key(rsa, &n, &e, NULL); + exp = BN_get_word(e); + bits = BN_num_bits(n); switch (exp) { case RSA_3: |