generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable use of OpenSSL that doesn't have DSA.

Browse Source 
Added #if LIBSSH2_DSA for all DSA functions.
This commit is contained in:
LarsNordin-LNdata 2015-03-30 17:10:07 +02:00 committed by Alexander Lamaison
parent 983ceafe58
commit e113202098
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openssl.c
View File

@ -656,6 +656,7 @@ gen_publickey_from_rsa(LIBSSH2_SESSION *session, RSA *rsa,
return key; return key;
} }
#if LIBSSH2_DSA
static unsigned char * static unsigned char *
gen_publickey_from_dsa(LIBSSH2_SESSION* session, DSA *dsa, gen_publickey_from_dsa(LIBSSH2_SESSION* session, DSA *dsa,
size_t *key_len) size_t *key_len)
@ -694,6 +695,7 @@ gen_publickey_from_dsa(LIBSSH2_SESSION* session, DSA *dsa,
*key_len = (size_t)(p - key); *key_len = (size_t)(p - key);
return key; return key;
} }
#endif /* LIBSSH_DSA */
static int static int
gen_publickey_from_rsa_evp(LIBSSH2_SESSION *session, gen_publickey_from_rsa_evp(LIBSSH2_SESSION *session,
@ -749,6 +751,7 @@ gen_publickey_from_rsa_evp(LIBSSH2_SESSION *session,
"Unable to allocate memory for private key data"); "Unable to allocate memory for private key data");
} }
#if LIBSSH2_DSA
static int static int
gen_publickey_from_dsa_evp(LIBSSH2_SESSION *session, gen_publickey_from_dsa_evp(LIBSSH2_SESSION *session,
unsigned char **method, unsigned char **method,
@ -802,6 +805,7 @@ gen_publickey_from_dsa_evp(LIBSSH2_SESSION *session,
LIBSSH2_ERROR_ALLOC, LIBSSH2_ERROR_ALLOC,
"Unable to allocate memory for private key data"); "Unable to allocate memory for private key data");
} }
#endif /* LIBSSH_DSA */
int int
_libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session, _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
@ -855,10 +859,12 @@ _libssh2_pub_priv_keyfile(LIBSSH2_SESSION *session,
session, method, method_len, pubkeydata, pubkeydata_len, pk); session, method, method_len, pubkeydata, pubkeydata_len, pk);
break; break;
#if LIBSSH2_DSA
case EVP_PKEY_DSA : case EVP_PKEY_DSA :
st = gen_publickey_from_dsa_evp( st = gen_publickey_from_dsa_evp(
session, method, method_len, pubkeydata, pubkeydata_len, pk); session, method, method_len, pubkeydata, pubkeydata_len, pk);
break; break;
#endif /* LIBSSH_DSA */
default : default :
st = _libssh2_error(session, st = _libssh2_error(session,
@ -921,12 +927,12 @@ _libssh2_pub_priv_keyfilememory(LIBSSH2_SESSION *session,
st = gen_publickey_from_rsa_evp(session, method, method_len, st = gen_publickey_from_rsa_evp(session, method, method_len,
pubkeydata, pubkeydata_len, pk); pubkeydata, pubkeydata_len, pk);
break; break;
#if LIBSSH2_DSA
case EVP_PKEY_DSA : case EVP_PKEY_DSA :
st = gen_publickey_from_dsa_evp(session, method, method_len, st = gen_publickey_from_dsa_evp(session, method, method_len,
pubkeydata, pubkeydata_len, pk); pubkeydata, pubkeydata_len, pk);
break; break;
#endif /* LIBSSH_DSA */
default : default :
st = _libssh2_error(session, st = _libssh2_error(session,
LIBSSH2_ERROR_FILE, LIBSSH2_ERROR_FILE,