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 /futility/cmd_create.c | |
| 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 'futility/cmd_create.c')
| -rw-r--r-- | futility/cmd_create.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/futility/cmd_create.c b/futility/cmd_create.c index 1efa23d9..9996449b 100644 --- a/futility/cmd_create.c +++ b/futility/cmd_create.c @@ -14,6 +14,7 @@ #include "2id.h" #include "2rsa.h" #include "2sha.h" +#include "openssl_compat.h" #include "util_misc.h" #include "vb2_common.h" #include "vb21_common.h" @@ -170,6 +171,7 @@ static int vb2_make_keypair() enum vb2_signature_algorithm sig_alg; uint8_t *pubkey_buf = 0; int has_priv = 0; + const BIGNUM *rsa_d; FILE *fp; int ret = 1; @@ -196,7 +198,8 @@ static int vb2_make_keypair() goto done; } /* Public keys doesn't have the private exponent */ - has_priv = !!rsa_key->d; + RSA_get0_key(rsa_key, NULL, NULL, &rsa_d); + has_priv = !!rsa_d; if (!has_priv) fprintf(stderr, "%s has a public key only.\n", infile); |