5 files changed, 14 insertions, 6 deletions
diff --git a/src/cert/cvc/cvc_ado.h b/src/cert/cvc/cvc_ado.h
index 230ee8b8d..65a39fd91 100644
--- a/src/cert/cvc/cvc_ado.h
+++ b/src/cert/cvc/cvc_ado.h
@@ -41,6 +41,7 @@ class BOTAN_DLL EAC1_1_ADO : public EAC1_1_obj<EAC1_1_ADO>
       * Create a signed CVC ADO request from to be signed (TBS) data
       * @param signer the signer used to sign the CVC ADO request
       * @param tbs_bits the TBS data to sign
+      * @param rng a random number generator
       */
       static MemoryVector<byte> make_signed(
          PK_Signer& signer,
diff --git a/src/cert/cvc/cvc_cert.h b/src/cert/cvc/cvc_cert.h
index 12bc41a9c..69d0d824a 100644
--- a/src/cert/cvc/cvc_cert.h
+++ b/src/cert/cvc/cvc_cert.h
@@ -92,7 +92,8 @@ inline bool operator!=(EAC1_1_CVC const& lhs, EAC1_1_CVC const& rhs)
 * @param holder_auth_templ the holder authorization value byte to
 * appear in the CHAT of the certificate
 * @param ced the CED to appear in the certificate
-* @param ced the CEX to appear in the certificate
+* @param cex the CEX to appear in the certificate
+* @param rng a random number generator
 */
 EAC1_1_CVC BOTAN_DLL make_cvc_cert(PK_Signer& signer,
                                    const MemoryRegion<byte>& public_key,
diff --git a/src/cert/cvc/cvc_gen_cert.h b/src/cert/cvc/cvc_gen_cert.h
index f37684afd..61861df41 100644
--- a/src/cert/cvc/cvc_gen_cert.h
+++ b/src/cert/cvc/cvc_gen_cert.h
@@ -70,6 +70,7 @@ class EAC1_1_gen_CVC : public EAC1_1_obj<Derived> // CRTP continuation from EAC1
       * Create a signed generalized CVC object.
       * @param signer the signer used to sign this object
       * @param tbs_bits the body the generalized CVC object to be signed
+      * @param rng a random number generator
       * @result the DER encoded signed generalized CVC object
       */
       static MemoryVector<byte> make_signed(
diff --git a/src/cert/cvc/cvc_self.h b/src/cert/cvc/cvc_self.h
index fb24ecd3a..f7bf6d5d8 100644
--- a/src/cert/cvc/cvc_self.h
+++ b/src/cert/cvc/cvc_self.h
@@ -97,7 +97,8 @@ namespace DE_EAC {
 * shall be entitled to read the biometrical iris image
 * @param fingerpr indicates whether the entity associated with the certificate
 * shall be entitled to read the biometrical fingerprint image
-* @param rng the rng to use
+* @param cvca_validity_months length of time in months this will be valid
+* @param rng a random number generator
 * @result the CVCA certificate created
 */
 EAC1_1_CVC BOTAN_DLL create_cvca(Private_Key const& priv_key,
@@ -146,8 +147,10 @@ EAC1_1_Req BOTAN_DLL create_cvc_req(Private_Key const& priv_key,
 * @param seqnr the sequence number of the certificate to be created
 * @param seqnr_len the number of digits the sequence number will be
 * encoded in
-* @param domestic indicates whether to sign a domestic or a foreign certificate:
-* set to true for domestic
+* @param domestic indicates whether to sign a domestic or a foreign
+* certificate: set to true for domestic
+* @param dvca_validity_months validity period in months
+* @param ca_is_validity_months validity period in months
 * @param rng a random number generator
 * @result the new certificate
 *
diff --git a/src/cert/cvc/signed_obj.h b/src/cert/cvc/signed_obj.h
index 0e7dd6bdb..c0ae2cfc5 100644
--- a/src/cert/cvc/signed_obj.h
+++ b/src/cert/cvc/signed_obj.h
@@ -50,6 +50,7 @@ class BOTAN_DLL EAC_Signed_Object
       /**
       * Check the signature of this object.
       * @param key the public key associated with this signed object
+      * @param sig the signature we are checking
       * @return true if the signature was created by the private key
       * associated with this public key
       */
@@ -59,9 +60,10 @@ class BOTAN_DLL EAC_Signed_Object
       /**
       * Write this object DER encoded into a specified pipe.
       * @param pipe the pipe to write the encoded object to
-      * @param enc the encoding type to use
+      * @param encoding the encoding type to use
       */
-      virtual void encode(Pipe&, X509_Encoding = PEM) const = 0;
+      virtual void encode(Pipe& pipe,
+                          X509_Encoding encoding = PEM) const = 0;
 
       /**
       * BER encode this object.