lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

pki: Use ssh_log_function() for ssh_pki_log().

Browse Source
This commit is contained in:
Andreas Schneider
2011-09-17 11:09:19 +02:00
parent b96943e861
commit fa7798833a
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/libssh/pki_priv.h
View File

@@ -27,7 +27,10 @@
#define DSA_HEADER_BEGIN "-----BEGIN DSA PRIVATE KEY-----" #define DSA_HEADER_BEGIN "-----BEGIN DSA PRIVATE KEY-----"
#define DSA_HEADER_END "-----END DSA PRIVATE KEY-----" #define DSA_HEADER_END "-----END DSA PRIVATE KEY-----"
void ssh_pki_log(const char *format, ...) PRINTF_ATTRIBUTE(1, 2); #define ssh_pki_log(...) \
_ssh_pki_log(__FUNCTION__, __VA_ARGS__)
void _ssh_pki_log(const char *function,
const char *format, ...) PRINTF_ATTRIBUTE(2, 3);
/* SSH Key Functions */ /* SSH Key Functions */
ssh_key pki_key_dup(const ssh_key key, int demote); ssh_key pki_key_dup(const ssh_key key, int demote);

5
src/pki.c
View File

@@ -64,7 +64,7 @@
#include "libssh/misc.h" #include "libssh/misc.h"
#include "libssh/agent.h" #include "libssh/agent.h"
void ssh_pki_log(const char *format, ...) void _ssh_pki_log(const char *function, const char *format, ...)
{ {
#ifdef DEBUG_CRYPTO #ifdef DEBUG_CRYPTO
char buffer[1024]; char buffer[1024];
@@ -74,8 +74,9 @@ void ssh_pki_log(const char *format, ...)
vsnprintf(buffer, sizeof(buffer), format, va); vsnprintf(buffer, sizeof(buffer), format, va);
va_end(va); va_end(va);
fprintf(stderr, "%s\n", buffer); ssh_log_function(function, buffer);
#else #else
(void) function;
(void) format; (void) format;
#endif #endif
return; return;