Skip to content
Permalink
Browse files
Fixed leak and added minor documentation for #6384.
  • Loading branch information
Ryman committed Sep 4, 2013
1 parent 6e17fa6 commit b539b372058613b94ef31073de6595ac5d882fd1
Showing with 10 additions and 2 deletions.
  1. +10 −2 src/common/crypto.c
@@ -195,6 +195,9 @@ try_load_engine(const char *path, const char *engine)
}
#endif

/* Returns a trimmed and human-readable version of an openssl version string
* <b>raw_version</b>. They are usually in the form of 'OpenSSL 1.0.0b 10
* May 2012' and this will parse them into a form similar to '1.0.0b' */
static char *
parse_openssl_version_str(const char *raw_version)
{
@@ -225,13 +228,17 @@ crypto_openssl_get_version_str(void)
return crypto_openssl_version_str;
}

static char *crypto_openssl_header_version_str = NULL;
/* Return a human-readable version of the compile-time openssl version
* number. */
const char *
crypto_openssl_get_header_version_str(void)
{
//return OPENSSL_VERSION_TEXT;
return parse_openssl_version_str(OPENSSL_VERSION_TEXT);
if (crypto_openssl_header_version_str == NULL) {
crypto_openssl_header_version_str =
parse_openssl_version_str(OPENSSL_VERSION_TEXT);
}
return crypto_openssl_header_version_str;
}

/** Initialize the crypto library. Return 0 on success, -1 on failure.
@@ -3114,6 +3121,7 @@ crypto_global_cleanup(void)
}
#endif
tor_free(crypto_openssl_version_str);
tor_free(crypto_openssl_header_version_str);
return 0;
}

0 comments on commit b539b37

Please sign in to comment.