aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/build-data/botan.doxy.in10
-rw-r--r--src/lib/pubkey/ec_group/curve_gfp.h5
-rw-r--r--src/lib/tls/tls_callbacks.h4
-rw-r--r--src/lib/utils/codec_base.h2
4 files changed, 11 insertions, 10 deletions
diff --git a/src/build-data/botan.doxy.in b/src/build-data/botan.doxy.in
index 11315a5c4..bbb0bbaf7 100644
--- a/src/build-data/botan.doxy.in
+++ b/src/build-data/botan.doxy.in
@@ -149,18 +149,20 @@ EXPAND_ONLY_PREDEF = NO
SEARCH_INCLUDES = YES
INCLUDE_PATH =
INCLUDE_FILE_PATTERNS =
-PREDEFINED = BOTAN_HAS_AES_SSSE3 \
+PREDEFINED = BOTAN_HAS_AES_ARMV8 \
BOTAN_HAS_AES_NI \
- BOTAN_HAS_AES_ARMV8 \
BOTAN_HAS_AES_POWER8 \
+ BOTAN_HAS_AES_SSSE3 \
+ BOTAN_HAS_CHACHA_SSE2 \
BOTAN_HAS_IDEA_SSE2 \
BOTAN_HAS_NOEKEON_SIMD \
BOTAN_HAS_SERPENT_SIMD \
- BOTAN_HAS_THREEFISH_512_AVX2 \
BOTAN_HAS_SHA1_SSE2 \
- BOTAN_HAS_CHACHA_SSE2 \
+ BOTAN_HAS_SHA2_32_X86 \
+ BOTAN_HAS_SHA2_32_X86_BMI2 \
BOTAN_HAS_SHACAL2_SIMD \
BOTAN_HAS_SHACAL2_X86 \
+ BOTAN_HAS_THREEFISH_512_AVX2 \
BOTAN_DEPRECATED(msg)= \
BOTAN_PUBLIC_API(maj,min)=
diff --git a/src/lib/pubkey/ec_group/curve_gfp.h b/src/lib/pubkey/ec_group/curve_gfp.h
index 338b524e8..ce3fe4eba 100644
--- a/src/lib/pubkey/ec_group/curve_gfp.h
+++ b/src/lib/pubkey/ec_group/curve_gfp.h
@@ -228,9 +228,8 @@ class BOTAN_UNSTABLE_API CurveGFp final
/**
* Equality operator
- * @param lhs a curve
- * @param rhs a curve
- * @return true iff lhs is the same as rhs
+ * @param other a curve
+ * @return true iff *this is the same as other
*/
inline bool operator==(const CurveGFp& other) const
{
diff --git a/src/lib/tls/tls_callbacks.h b/src/lib/tls/tls_callbacks.h
index 1e0aca9a9..b35cf0051 100644
--- a/src/lib/tls/tls_callbacks.h
+++ b/src/lib/tls/tls_callbacks.h
@@ -340,11 +340,11 @@ class BOTAN_PUBLIC_API(2,0) Compat_Callbacks final : public Callbacks
typedef std::function<std::string (std::vector<std::string>)> next_protocol_fn;
/**
- * @param output_fn is called with data for the outbound socket
+ * @param data_output_fn is called with data for the outbound socket
*
* @param app_data_cb is called when new application data is received
*
- * @param alert_cb is called when a TLS alert is received
+ * @param recv_alert_cb is called when a TLS alert is received
*
* @param hs_cb is called when a handshake is completed
*
diff --git a/src/lib/utils/codec_base.h b/src/lib/utils/codec_base.h
index 7b5a5f18c..e7dbc33e4 100644
--- a/src/lib/utils/codec_base.h
+++ b/src/lib/utils/codec_base.h
@@ -16,7 +16,7 @@ namespace Botan {
/**
* Perform encoding using the base provided
-* @param encoding object giving access to the encodings specifications
+* @param base object giving access to the encodings specifications
* @param output an array of at least base.encode_max_output bytes
* @param input is some binary data
* @param input_length length of input in bytes