diff options
author | Damien Miller <djm@mindrot.org> | 2018-09-13 12:13:50 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-09-13 12:13:50 +1000 |
commit | 48f54b9d12c1c79fba333bc86d455d8f4cda8cfc (patch) | |
tree | 216db3d44f6d07262ce4757e65705fcc9fb6b5fa /sshkey.c | |
parent | 86112951d63d48839f035b5795be62635a463f99 (diff) |
adapt -portable to OpenSSL 1.1x API
Polyfill missing API with replacement functions extracted from LibreSSL
Diffstat (limited to 'sshkey.c')
-rw-r--r-- | sshkey.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -60,6 +60,8 @@ | |||
60 | 60 | ||
61 | #include "xmss_fast.h" | 61 | #include "xmss_fast.h" |
62 | 62 | ||
63 | #include "openbsd-compat/openssl-compat.h" | ||
64 | |||
63 | /* openssh private key file format */ | 65 | /* openssh private key file format */ |
64 | #define MARK_BEGIN "-----BEGIN OPENSSH PRIVATE KEY-----\n" | 66 | #define MARK_BEGIN "-----BEGIN OPENSSH PRIVATE KEY-----\n" |
65 | #define MARK_END "-----END OPENSSH PRIVATE KEY-----\n" | 67 | #define MARK_END "-----END OPENSSH PRIVATE KEY-----\n" |
@@ -1744,7 +1746,6 @@ int | |||
1744 | sshkey_from_private(const struct sshkey *k, struct sshkey **pkp) | 1746 | sshkey_from_private(const struct sshkey *k, struct sshkey **pkp) |
1745 | { | 1747 | { |
1746 | struct sshkey *n = NULL; | 1748 | struct sshkey *n = NULL; |
1747 | int ret = SSH_ERR_INTERNAL_ERROR; | ||
1748 | int r = SSH_ERR_INTERNAL_ERROR; | 1749 | int r = SSH_ERR_INTERNAL_ERROR; |
1749 | #ifdef WITH_OPENSSL | 1750 | #ifdef WITH_OPENSSL |
1750 | const BIGNUM *rsa_n, *rsa_e; | 1751 | const BIGNUM *rsa_n, *rsa_e; |