aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2019-04-22 10:23:56 -0400
committerJack Lloyd <[email protected]>2019-04-22 10:23:56 -0400
commitf32c892f2014d65580a7225f8d18604e850a7e5a (patch)
tree01670b76653856eac3abf12a3c84578a32bfb759
parent3be52df83b8fbada9928a4faa380a738ac2115c8 (diff)
Fix some Doxygen errors
-rw-r--r--src/build-data/botan.doxy.in2
-rw-r--r--src/lib/utils/os_utils.h4
-rw-r--r--src/lib/x509/certstor_flatfile/certstor_flatfile.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/src/build-data/botan.doxy.in b/src/build-data/botan.doxy.in
index 79ac34667..71fd71010 100644
--- a/src/build-data/botan.doxy.in
+++ b/src/build-data/botan.doxy.in
@@ -165,6 +165,8 @@ PREDEFINED = BOTAN_HAS_AES_ARMV8 \
BOTAN_HAS_SHA1_SSE2 \
BOTAN_HAS_SHA2_32_X86 \
BOTAN_HAS_SHA2_32_X86_BMI2 \
+ BOTAN_HAS_SHA2_64_BMI2 \
+ BOTAN_HAS_SHA3_BMI2 \
BOTAN_HAS_SHACAL2_SIMD \
BOTAN_HAS_SHACAL2_X86 \
BOTAN_HAS_SM4_ARMV8 \
diff --git a/src/lib/utils/os_utils.h b/src/lib/utils/os_utils.h
index 81d66f170..e10b529db 100644
--- a/src/lib/utils/os_utils.h
+++ b/src/lib/utils/os_utils.h
@@ -104,11 +104,11 @@ const char* read_env_variable(const std::string& var_name);
size_t read_env_variable_sz(const std::string& var_name, size_t def_value = 0);
/**
-* Request @count pages of RAM which are locked into memory using mlock,
+* Request @param count pages of RAM which are locked into memory using mlock,
* VirtualLock, or some similar OS specific API. Free it with free_locked_pages.
*
* Returns an empty list on failure. This function is allowed to return fewer
-* than @count pages.
+* than @param count pages.
*
* The contents of the allocated pages are undefined.
*
diff --git a/src/lib/x509/certstor_flatfile/certstor_flatfile.h b/src/lib/x509/certstor_flatfile/certstor_flatfile.h
index 8d1da3074..a778e045e 100644
--- a/src/lib/x509/certstor_flatfile/certstor_flatfile.h
+++ b/src/lib/x509/certstor_flatfile/certstor_flatfile.h
@@ -26,6 +26,7 @@ class BOTAN_PUBLIC_API(2, 11) Flatfile_Certificate_Store final : public Certific
* Construct a new Certificate_Store given a file path to a file including
* PEMs of trusted self-signed CAs.
*
+ * @param file the name of the file to read certificates from
* @param ignore_non_ca if true, certs that are not self-signed CA certs will
* be ignored. Otherwise (if false), an exception will be thrown instead.
*/