shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 10:40:27 +09:00
Code Issues Packages Projects Releases Wiki Activity

include: Fix HAVE_<FEATURE> checks in pki.h

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-10-01 19:00:40 +02:00
parent f65c00f39d
commit e27c6b21b5
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/libssh/pki.h
View File

@@ -44,23 +44,23 @@ struct ssh_key_struct {
int flags; int flags;
const char *type_c; /* Don't free it ! it is static */ const char *type_c; /* Don't free it ! it is static */
int ecdsa_nid; int ecdsa_nid;
#ifdef HAVE_LIBGCRYPT #if defined(HAVE_LIBGCRYPT)
gcry_sexp_t dsa; gcry_sexp_t dsa;
gcry_sexp_t rsa; gcry_sexp_t rsa;
gcry_sexp_t ecdsa; gcry_sexp_t ecdsa;
#elif HAVE_LIBMBEDCRYPTO #elif defined(HAVE_LIBMBEDCRYPTO)
mbedtls_pk_context *rsa; mbedtls_pk_context *rsa;
mbedtls_ecdsa_context *ecdsa; mbedtls_ecdsa_context *ecdsa;
void *dsa; void *dsa;
#elif HAVE_LIBCRYPTO #elif defined(HAVE_LIBCRYPTO)
DSA *dsa; DSA *dsa;
RSA *rsa; RSA *rsa;
#ifdef HAVE_OPENSSL_ECC # if defined(HAVE_OPENSSL_ECC)
EC_KEY *ecdsa; EC_KEY *ecdsa;
#else # else
void *ecdsa; void *ecdsa;
#endif /* HAVE_OPENSSL_EC_H */ # endif /* HAVE_OPENSSL_EC_H */
#endif #endif /* HAVE_LIBGCRYPT */
ed25519_pubkey *ed25519_pubkey; ed25519_pubkey *ed25519_pubkey;
ed25519_privkey *ed25519_privkey; ed25519_privkey *ed25519_privkey;
void *cert; void *cert;
@@ -71,11 +71,11 @@ struct ssh_signature_struct {
enum ssh_keytypes_e type; enum ssh_keytypes_e type;
enum ssh_digest_e hash_type; enum ssh_digest_e hash_type;
const char *type_c; const char *type_c;
#ifdef HAVE_LIBGCRYPT #if defined(HAVE_LIBGCRYPT)
gcry_sexp_t dsa_sig; gcry_sexp_t dsa_sig;
gcry_sexp_t rsa_sig; gcry_sexp_t rsa_sig;
gcry_sexp_t ecdsa_sig; gcry_sexp_t ecdsa_sig;
#elif defined HAVE_LIBCRYPTO #elif defined(HAVE_LIBCRYPTO)
DSA_SIG *dsa_sig; DSA_SIG *dsa_sig;
ssh_string rsa_sig; ssh_string rsa_sig;
# ifdef HAVE_OPENSSL_ECC # ifdef HAVE_OPENSSL_ECC
@@ -83,10 +83,10 @@ struct ssh_signature_struct {
# else # else
void *ecdsa_sig; void *ecdsa_sig;
# endif # endif
#elif defined HAVE_LIBMBEDCRYPTO #elif defined(HAVE_LIBMBEDCRYPTO)
ssh_string rsa_sig; ssh_string rsa_sig;
struct mbedtls_ecdsa_sig ecdsa_sig; struct mbedtls_ecdsa_sig ecdsa_sig;
#endif #endif /* HAVE_LIBGCRYPT */
ed25519_signature *ed25519_sig; ed25519_signature *ed25519_sig;
}; };