aboutsummaryrefslogtreecommitdiff
path: root/src/common/crypto.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-06-04 19:51:00 -0400
committerNick Mathewson <nickm@torproject.org>2012-06-04 19:59:08 -0400
commit173b18c79b8e1f3a28e8b4122adb2b4ccf836c7b (patch)
treeefafbba046b207699cf9b3bf1ff3ff97ecba38c9 /src/common/crypto.c
parentb353cd7e508fd436ce4ec4bd55c52cc7619b29fd (diff)
downloadtor-173b18c79b8e1f3a28e8b4122adb2b4ccf836c7b.tar.gz
tor-173b18c79b8e1f3a28e8b4122adb2b4ccf836c7b.zip
Add about 60 more DOCDOC comments to 0.2.3
Also, try to resolve some doxygen issues. First, define a magic "This is doxygen!" macro so that we take the correct branch in various #if/#else/#endifs in order to get the right documentation. Second, add in a few grouping @{ and @} entries in order to get some variables and fields to get grouped together.
Diffstat (limited to 'src/common/crypto.c')
-rw-r--r--src/common/crypto.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 8feac95acf..86f19dfb6a 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -69,7 +69,7 @@
/** Longest recognized */
#define MAX_DNS_LABEL_SIZE 63
-#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(0,9,8)
+#if OPENSSL_VERSION_NUMBER < OPENSSL_V_SERIES(0,9,8) && !defined(RUNNING_DOXYGEN)
/** @{ */
/** On OpenSSL versions before 0.9.8, there is no working SHA256
* implementation, so we use Tom St Denis's nice speedy one, slightly adapted
@@ -404,6 +404,8 @@ crypto_cipher_new_with_iv(const char *key, const char *iv)
return env;
}
+/** Return a new crypto_cipher_t with the provided <b>key</b> and an IV of all
+ * zero bytes. */
crypto_cipher_t *
crypto_cipher_new(const char *key)
{