lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-31 00:03:07 +03:00
Code Activity

Remove internal calls to ssh_init

Browse Source 
Since the call is made automatically when the library is loaded, these
calls are no longer required (if the library is not linked statically).

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Anderson Toshiyuki Sasaki
2018-07-31 16:15:01 +02:00
committed by Andreas Schneider
parent e0e0d62a71
commit 9305762fcd
6 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bind.c
View File

@ -253,11 +253,6 @@ int ssh_bind_listen(ssh_bind sshbind) {
socket_t fd; socket_t fd;
int rc; int rc;
if (ssh_init() < 0) {
ssh_set_error(sshbind, SSH_FATAL, "ssh_init() failed");
return -1;
}
if (sshbind->rsa == NULL && if (sshbind->rsa == NULL &&
sshbind->dsa == NULL && sshbind->dsa == NULL &&
sshbind->ecdsa == NULL && sshbind->ecdsa == NULL &&

3
src/client.c
View File

@ -505,9 +505,6 @@ int ssh_connect(ssh_session session) {
session->alive = 0; session->alive = 0;
session->client = 1; session->client = 1;
if (ssh_init() < 0) {
return SSH_ERROR;
}
if (session->opts.fd == SSH_INVALID_SOCKET && if (session->opts.fd == SSH_INVALID_SOCKET &&
session->opts.host == NULL && session->opts.host == NULL &&
session->opts.ProxyCommand == NULL) { session->opts.ProxyCommand == NULL) {

10
src/pki_crypto.c
View File

@ -637,11 +637,6 @@ ssh_string pki_private_key_to_pem(const ssh_key key,
BIO *mem; BIO *mem;
int rc; int rc;
/* needed for openssl initialization */
if (ssh_init() < 0) {
return NULL;
}
mem = BIO_new(BIO_s_mem()); mem = BIO_new(BIO_s_mem());
if (mem == NULL) { if (mem == NULL) {
return NULL; return NULL;
@ -768,11 +763,6 @@ ssh_key pki_private_key_from_base64(const char *b64_key,
void *ecdsa = NULL; void *ecdsa = NULL;
#endif #endif
/* needed for openssl initialization */
if (ssh_init() < 0) {
return NULL;
}
type = pki_privatekey_type_from_string(b64_key); type = pki_privatekey_type_from_string(b64_key);
if (type == SSH_KEYTYPE_UNKNOWN) { if (type == SSH_KEYTYPE_UNKNOWN) {
SSH_LOG(SSH_LOG_WARN, "Unknown or invalid private key."); SSH_LOG(SSH_LOG_WARN, "Unknown or invalid private key.");

5
src/pki_gcrypt.c
View File

@ -918,11 +918,6 @@ ssh_key pki_private_key_from_base64(const char *b64_key,
enum ssh_keytypes_e type; enum ssh_keytypes_e type;
int valid; int valid;
/* needed for gcrypt initialization */
if (ssh_init() < 0) {
return NULL;
}
type = pki_privatekey_type_from_string(b64_key); type = pki_privatekey_type_from_string(b64_key);
if (type == SSH_KEYTYPE_UNKNOWN) { if (type == SSH_KEYTYPE_UNKNOWN) {
SSH_LOG(SSH_LOG_WARN, "Unknown or invalid private key."); SSH_LOG(SSH_LOG_WARN, "Unknown or invalid private key.");

4
src/pki_mbedcrypto.c
View File

@ -74,10 +74,6 @@ ssh_key pki_private_key_from_base64(const char *b64_key, const char *passphrase,
size_t b64len = strlen(b64_key) + 1; size_t b64len = strlen(b64_key) + 1;
unsigned char tmp[MAX_PASSPHRASE_SIZE] = {0}; unsigned char tmp[MAX_PASSPHRASE_SIZE] = {0};
if (ssh_init() < 0) {
return NULL;
}
type = pki_privatekey_type_from_string(b64_key); type = pki_privatekey_type_from_string(b64_key);
if (type == SSH_KEYTYPE_UNKNOWN) { if (type == SSH_KEYTYPE_UNKNOWN) {
SSH_LOG(SSH_LOG_WARN, "Unknown or invalid private key."); SSH_LOG(SSH_LOG_WARN, "Unknown or invalid private key.");

6
tests/unittests/torture_threads_pki_rsa.c
View File

@ -727,8 +727,14 @@ int torture_run_tests(void)
* The original tests in torture_pki_rsa.c require files to be erased * The original tests in torture_pki_rsa.c require files to be erased
*/ */
/*
* If the library is statically linked, ssh_init() is not called
* automatically
*/
ssh_init();
torture_filter_tests(tests); torture_filter_tests(tests);
rc = cmocka_run_group_tests(tests, NULL, NULL); rc = cmocka_run_group_tests(tests, NULL, NULL);
ssh_finalize();
return rc; return rc;
} }