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

Fix init/exit logic. Add self-test of it.

Browse Source
This commit is contained in:
Simon Josefsson 2010-03-19 09:27:19 +01:00
parent 2e3f380ff2
commit fa4017c613
2 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/global.c
View File

@ -43,24 +43,24 @@ static int _libssh2_init_flags = 0;
LIBSSH2_API int libssh2_init(int flags)
{
if (libssh2_initialized == 0 && !(flags & LIBSSH2_INIT_NO_CRYPTO)) {
if (_libssh2_initialized == 0 && !(flags & LIBSSH2_INIT_NO_CRYPTO)) {
libssh2_crypto_init();
}
libssh2_initialized++;
libssh2_init_flags &= flags;
_libssh2_initialized++;
_libssh2_init_flags |= flags;
return 0;
}
LIBSSH2_API void libssh2_exit()
{
if (libssh2_initialized == 0)
if (_libssh2_initialized == 0)
return;
libssh2_initialized--;
_libssh2_initialized--;
if (!(libssh2_init_flags & LIBSSH2_INIT_NO_CRYPTO)) {
if (!(_libssh2_init_flags & LIBSSH2_INIT_NO_CRYPTO)) {
libssh2_crypto_exit();
}

72
tests/simple.c
View File

@ -1,5 +1,5 @@
/* Copyright (C) 2007 The Written Word, Inc.
* Copyright (C) 2008 Simon Josefsson
* Copyright (C) 2008, 2010 Simon Josefsson
* All rights reserved.
*
* Redistribution and use in source and binary forms,
@ -43,46 +43,56 @@
static int test_libssh2_base64_decode (LIBSSH2_SESSION *session)
{
char *data;
unsigned int datalen;
const char *src = "Zm5vcmQ=";
unsigned int src_len = strlen (src);
int ret;
char *data;
unsigned int datalen;
const char *src = "Zm5vcmQ=";
unsigned int src_len = strlen (src);
int ret;
ret = libssh2_base64_decode(session, &data, &datalen,
src, src_len);
if (ret)
return ret;
ret = libssh2_base64_decode(session, &data, &datalen,
src, src_len);
if (ret)
return ret;
if (datalen != 5 || strcmp (data, "fnord") != 0)
{
fprintf (stderr,
"libssh2_base64_decode() failed (%d, %.*s)\n",
datalen, datalen, data);
return 1;
}
if (datalen != 5 || strcmp (data, "fnord") != 0)
{
fprintf (stderr,
"libssh2_base64_decode() failed (%d, %.*s)\n",
datalen, datalen, data);
return 1;
}
free (data);
free (data);
return 0;
return 0;
}
int main(int argc, char *argv[])
{
LIBSSH2_SESSION *session;
(void)argv;
(void)argc;
LIBSSH2_SESSION *session;
(void)argv;
(void)argc;
int rc;
session = libssh2_session_init();
if (!session)
{
fprintf (stderr, "libssh2_session_init() failed\n");
return 1;
}
rc = libssh2_init (LIBSSH2_INIT_NO_CRYPTO);
if (rc != 0)
{
fprintf (stderr, "libssh2_init() failed: %d\n", rc);
return 1;
}
test_libssh2_base64_decode (session);
session = libssh2_session_init();
if (!session)
{
fprintf (stderr, "libssh2_session_init() failed\n");
return 1;
}
libssh2_session_free(session);
test_libssh2_base64_decode (session);
return 0;
libssh2_session_free(session);
libssh2_exit ();
return 0;
}