5 files changed, 10 insertions, 9 deletions
diff --git a/src/cert/cvc/cvc_cert.cpp b/src/cert/cvc/cvc_cert.cpp
index 71ca0cf16..d2be12df8 100644
--- a/src/cert/cvc/cvc_cert.cpp
+++ b/src/cert/cvc/cvc_cert.cpp
@@ -58,7 +58,7 @@ void EAC1_1_CVC::force_decode()
    if(cpi != 0)
       throw Decoding_Error("EAC1_1 certificate´s cpi was not 0");
 
-   // XXX: PK algos have no notion of EAC encoder/decoder currently
+   // FIXME: PK algos have no notion of EAC encoder/decoder currently
 #if 0
    ECDSA_PublicKey tmp_pk;
    std::auto_ptr<EAC1_1_CVC_Decoder> dec = tmp_pk.cvc_eac1_1_decoder();
diff --git a/src/cert/cvc/cvc_req.cpp b/src/cert/cvc/cvc_req.cpp
index a9a94827c..70a44bacd 100644
--- a/src/cert/cvc/cvc_req.cpp
+++ b/src/cert/cvc/cvc_req.cpp
@@ -41,7 +41,7 @@ void EAC1_1_Req::force_decode()
       throw Decoding_Error("EAC1_1 request´s cpi was not 0");
       }
 
-   // XXX: No EAC support in ECDSA
+   // FIXME: No EAC support in ECDSA
 #if 0
    ECDSA_PublicKey tmp_pk;
    std::auto_ptr<EAC1_1_CVC_Decoder> dec = tmp_pk.cvc_eac1_1_decoder();
diff --git a/src/cert/cvc/cvc_self.cpp b/src/cert/cvc/cvc_self.cpp
index 45a584cb3..91ea38724 100644
--- a/src/cert/cvc/cvc_self.cpp
+++ b/src/cert/cvc/cvc_self.cpp
@@ -86,7 +86,7 @@ EAC1_1_CVC create_self_signed_cert(Private_Key const& key,
 
    std::auto_ptr<Botan::PK_Signer> signer(get_pk_signer(*priv_key, padding_and_hash));
 
-#if 0
+#if 0 // FIXME
    std::auto_ptr<EAC1_1_CVC_Encoder> enc(priv_key->cvc_eac1_1_encoder());
    MemoryVector<byte> enc_public_key = enc->public_key(sig_algo);
 #else
@@ -115,7 +115,7 @@ EAC1_1_Req create_cvc_req(Private_Key const& key,
 
    std::auto_ptr<Botan::PK_Signer> signer(get_pk_signer(*priv_key, padding_and_hash));
 
-#if 0
+#if 0 // FIXME
    std::auto_ptr<EAC1_1_CVC_Encoder> enc(priv_key->cvc_eac1_1_encoder());
    MemoryVector<byte> enc_public_key = enc->public_key(sig_algo);
 #else
@@ -215,7 +215,7 @@ EAC1_1_CVC link_cvca(EAC1_1_CVC const& signer,
    ECDSA_PublicKey*  subj_pk = dynamic_cast<ECDSA_PublicKey*>(pk.get());
    subj_pk->set_parameter_encoding(ENC_EXPLICIT);
 
-#if 0
+#if 0 // FIXME
    std::auto_ptr<EAC1_1_CVC_Encoder> enc(subj_pk->cvc_eac1_1_encoder());
    MemoryVector<byte> enc_public_key = enc->public_key(sig_algo);
 #else
@@ -261,7 +261,7 @@ EAC1_1_CVC sign_request(EAC1_1_CVC const& signer_cert,
 
    subj_pk->set_parameter_encoding(ENC_IMPLICITCA);
 
-#if 0
+#if 0 // FIXME
    std::auto_ptr<EAC1_1_CVC_Encoder> enc(subj_pk->cvc_eac1_1_encoder());
    MemoryVector<byte> enc_public_key = enc->public_key(sig_algo);
 #else
diff --git a/src/pubkey/eckaeg/eckaeg.cpp b/src/pubkey/eckaeg/eckaeg.cpp
index 0d094e2e1..b8ff75d89 100644
--- a/src/pubkey/eckaeg/eckaeg.cpp
+++ b/src/pubkey/eckaeg/eckaeg.cpp
@@ -129,9 +129,10 @@ MemoryVector<byte> ECKAEG_PrivateKey::public_value() const
 /**
 * Derive a key
 */
-SecureVector<byte> ECKAEG_PrivateKey::derive_key(const byte key[], u32bit key_len) const
+SecureVector<byte> ECKAEG_PrivateKey::derive_key(const byte key[],
+                                                 u32bit key_len) const
    {
-   MemoryVector<byte> key_x(key, key_len); // XXX fix this, nasty/slow
+   MemoryVector<byte> key_x(key, key_len); // FIXME: nasty/slow
    PointGFp point = OS2ECP(key_x, public_point().get_curve());
 
    return m_eckaeg_core.agree(point);
diff --git a/src/pubkey/pk_codecs/pkcs8.h b/src/pubkey/pk_codecs/pkcs8.h
index 0965e5ff1..28008bdba 100644
--- a/src/pubkey/pk_codecs/pkcs8.h
+++ b/src/pubkey/pk_codecs/pkcs8.h
@@ -30,7 +30,7 @@ class BOTAN_DLL PKCS8_Encoder
       * Get the DER encoded key.
       * @return the DER encoded key
       */
-      // XXX: Why not SecureVector?
+      // FIXME: Why not SecureVector?
       virtual MemoryVector<byte> key_bits() const = 0;
       virtual ~PKCS8_Encoder() {}
    };