aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2017-03-13 20:49:53 -0400
committerJack Lloyd <[email protected]>2017-03-13 20:49:53 -0400
commit0631fc7ae2040b23f5574b065d6c39742f25e711 (patch)
tree44d84dbc500ca23b08623472a1de88f506bf31d6 /src
parent9961e475f10a671a8e25080958d26c8c356057ef (diff)
parent823371d06b55043425f9254ac594f74e6a58eee4 (diff)
Merge GH #907 API doc fixes
Diffstat (limited to 'src')
-rw-r--r--src/lib/entropy/entropy_src.h6
-rw-r--r--src/lib/x509/x509path.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/entropy/entropy_src.h b/src/lib/entropy/entropy_src.h
index 94c67a18e..fe177657c 100644
--- a/src/lib/entropy/entropy_src.h
+++ b/src/lib/entropy/entropy_src.h
@@ -25,11 +25,11 @@ class RandomNumberGenerator;
class BOTAN_DLL Entropy_Source
{
public:
- /*
+ /**
* Return a new entropy source of a particular type, or null
* Each entropy source may require substantial resources (eg, a file handle
* or socket instance), so try to share them among multiple RNGs, or just
- * use the preconfigured global list accessed by global_entropy_sources()
+ * use the preconfigured global list accessed by Entropy_Sources::global_sources()
*/
static std::unique_ptr<Entropy_Source> create(const std::string& type);
@@ -41,7 +41,7 @@ class BOTAN_DLL Entropy_Source
/**
* Perform an entropy gathering poll
* @param rng will be provided with entropy via calls to add_entropy
- @ @return conservative estimate of actual entropy added to rng during poll
+ * @return conservative estimate of actual entropy added to rng during poll
*/
virtual size_t poll(RandomNumberGenerator& rng) = 0;
diff --git a/src/lib/x509/x509path.h b/src/lib/x509/x509path.h
index a193ebe55..6dd3c21f7 100644
--- a/src/lib/x509/x509path.h
+++ b/src/lib/x509/x509path.h
@@ -229,7 +229,7 @@ Path_Validation_Result BOTAN_DLL x509_path_validate(
* @param hostname if not empty, compared against the DNS name in end_cert
* @param usage if not set to UNSPECIFIED, compared against the key usage in end_cert
* @param validation_time what reference time to use for validation
-* @param ocsp_timeout timeoutput for OCSP operations, 0 disables OCSP check
+* @param ocsp_timeout timeout for OCSP operations, 0 disables OCSP check
* @param ocsp_resp additional OCSP responses to consider (eg from peer)
* @return result of the path validation
*/