mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-11 10:40:27 +09:00
Use BIO* in _privatekey_from_file [Oliver Stöneberg]
_privatekey_from_file: moved FILE* into HAVE_LIBGCRYPT code / added missing #ifdef's to default case of switch [Oliver Stöneberg]
This commit is contained in:
committed by
Andreas Schneider
parent
e5fb20c17b
commit
da8356b477
@@ -890,8 +890,6 @@ ssh_private_key _privatekey_from_file(void *session, const char *filename,
|
|||||||
ssh_set_error(session, SSH_FATAL,
|
ssh_set_error(session, SSH_FATAL,
|
||||||
"Parsing private key %s: %s",
|
"Parsing private key %s: %s",
|
||||||
filename, ERR_error_string(ERR_get_error(), NULL));
|
filename, ERR_error_string(ERR_get_error(), NULL));
|
||||||
#else
|
|
||||||
{
|
|
||||||
#endif
|
#endif
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@@ -913,8 +911,6 @@ ssh_private_key _privatekey_from_file(void *session, const char *filename,
|
|||||||
ssh_set_error(session, SSH_FATAL,
|
ssh_set_error(session, SSH_FATAL,
|
||||||
"Parsing private key %s: %s",
|
"Parsing private key %s: %s",
|
||||||
filename, ERR_error_string(ERR_get_error(), NULL));
|
filename, ERR_error_string(ERR_get_error(), NULL));
|
||||||
#else
|
|
||||||
{
|
|
||||||
#endif
|
#endif
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user