diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/pubkey/dsa/dsa.h | 2 | ||||
-rw-r--r-- | src/lib/pubkey/ecc_key/ecc_key.h | 5 | ||||
-rw-r--r-- | src/lib/pubkey/ecdh/ecdh.h | 4 | ||||
-rw-r--r-- | src/lib/pubkey/ecdsa/ecdsa.h | 2 | ||||
-rw-r--r-- | src/lib/pubkey/ecgdsa/ecgdsa.h | 2 | ||||
-rw-r--r-- | src/lib/pubkey/eckcdsa/eckcdsa.h | 2 | ||||
-rw-r--r-- | src/lib/pubkey/elgamal/elgamal.h | 2 | ||||
-rw-r--r-- | src/lib/pubkey/gost_3410/gost_3410.h | 2 | ||||
-rw-r--r-- | src/lib/pubkey/rsa/rsa.h | 2 |
9 files changed, 12 insertions, 11 deletions
diff --git a/src/lib/pubkey/dsa/dsa.h b/src/lib/pubkey/dsa/dsa.h index 117853907..a39105d8f 100644 --- a/src/lib/pubkey/dsa/dsa.h +++ b/src/lib/pubkey/dsa/dsa.h @@ -59,7 +59,7 @@ class BOTAN_DLL DSA_PrivateKey : public DSA_PublicKey, /** * Load a private key. * @param alg_id the X.509 algorithm identifier - * @param key_bits PKCS#8 structure + * @param key_bits DER encoded key bits in ANSI X9.57 format */ DSA_PrivateKey(const AlgorithmIdentifier& alg_id, const secure_vector<uint8_t>& key_bits); diff --git a/src/lib/pubkey/ecc_key/ecc_key.h b/src/lib/pubkey/ecc_key/ecc_key.h index d4ce6c0e7..60e29bffc 100644 --- a/src/lib/pubkey/ecc_key/ecc_key.h +++ b/src/lib/pubkey/ecc_key/ecc_key.h @@ -121,8 +121,9 @@ class BOTAN_DLL EC_PrivateKey : public virtual EC_PublicKey, bool with_modular_inverse=false); /* - * Creates a new private key object from the given - * key_bits. If with_modular_inverse is set, + * Creates a new private key object from the + * ECPrivateKey structure given in key_bits. + * If with_modular_inverse is set, * the public key will be calculated by multiplying * the base point with the modular inverse of * x (as in ECGDSA and ECKCDSA), otherwise by diff --git a/src/lib/pubkey/ecdh/ecdh.h b/src/lib/pubkey/ecdh/ecdh.h index 7524a80ff..f5dc5a05d 100644 --- a/src/lib/pubkey/ecdh/ecdh.h +++ b/src/lib/pubkey/ecdh/ecdh.h @@ -70,9 +70,9 @@ class BOTAN_DLL ECDH_PrivateKey : public ECDH_PublicKey, public: /** - * Create an ECDH public key. + * Load a private key. * @param alg_id the X.509 algorithm identifier - * @param key_bits X.509 subject public key info structure + * @param key_bits ECPrivateKey bits */ ECDH_PrivateKey(const AlgorithmIdentifier& alg_id, const secure_vector<uint8_t>& key_bits) : diff --git a/src/lib/pubkey/ecdsa/ecdsa.h b/src/lib/pubkey/ecdsa/ecdsa.h index 21535a2f4..8281c63fd 100644 --- a/src/lib/pubkey/ecdsa/ecdsa.h +++ b/src/lib/pubkey/ecdsa/ecdsa.h @@ -68,7 +68,7 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey, /** * Load a private key * @param alg_id the X.509 algorithm identifier - * @param key_bits PKCS #8 structure + * @param key_bits ECPrivateKey bits */ ECDSA_PrivateKey(const AlgorithmIdentifier& alg_id, const secure_vector<uint8_t>& key_bits) : diff --git a/src/lib/pubkey/ecgdsa/ecgdsa.h b/src/lib/pubkey/ecgdsa/ecgdsa.h index 1d079bf38..9fb55de06 100644 --- a/src/lib/pubkey/ecgdsa/ecgdsa.h +++ b/src/lib/pubkey/ecgdsa/ecgdsa.h @@ -66,7 +66,7 @@ class BOTAN_DLL ECGDSA_PrivateKey : public ECGDSA_PublicKey, /** * Load a private key. * @param alg_id the X.509 algorithm identifier - * @param key_bits PKCS #8 structure + * @param key_bits ECPrivateKey bits */ ECGDSA_PrivateKey(const AlgorithmIdentifier& alg_id, const secure_vector<uint8_t>& key_bits) : diff --git a/src/lib/pubkey/eckcdsa/eckcdsa.h b/src/lib/pubkey/eckcdsa/eckcdsa.h index 21bfbdc3c..e941a393d 100644 --- a/src/lib/pubkey/eckcdsa/eckcdsa.h +++ b/src/lib/pubkey/eckcdsa/eckcdsa.h @@ -66,7 +66,7 @@ class BOTAN_DLL ECKCDSA_PrivateKey : public ECKCDSA_PublicKey, /** * Load a private key. * @param alg_id the X.509 algorithm identifier - * @param key_bits PKCS #8 structure + * @param key_bits ECPrivateKey bits */ ECKCDSA_PrivateKey(const AlgorithmIdentifier& alg_id, const secure_vector<uint8_t>& key_bits) : diff --git a/src/lib/pubkey/elgamal/elgamal.h b/src/lib/pubkey/elgamal/elgamal.h index 688232631..0453e3564 100644 --- a/src/lib/pubkey/elgamal/elgamal.h +++ b/src/lib/pubkey/elgamal/elgamal.h @@ -59,7 +59,7 @@ class BOTAN_DLL ElGamal_PrivateKey : public ElGamal_PublicKey, /** * Load a private key. * @param alg_id the X.509 algorithm identifier - * @param key_bits PKCS #8 structure + * @param key_bits DER encoded key bits in ANSI X9.42 format */ ElGamal_PrivateKey(const AlgorithmIdentifier& alg_id, const secure_vector<uint8_t>& key_bits); diff --git a/src/lib/pubkey/gost_3410/gost_3410.h b/src/lib/pubkey/gost_3410/gost_3410.h index dbaf68ada..d7ae4a7dc 100644 --- a/src/lib/pubkey/gost_3410/gost_3410.h +++ b/src/lib/pubkey/gost_3410/gost_3410.h @@ -71,7 +71,7 @@ class BOTAN_DLL GOST_3410_PrivateKey : public GOST_3410_PublicKey, /** * Load a private key. * @param alg_id the X.509 algorithm identifier - * @param key_bits PKCS #8 structure + * @param key_bits ECPrivateKey bits */ GOST_3410_PrivateKey(const AlgorithmIdentifier& alg_id, const secure_vector<uint8_t>& key_bits) : diff --git a/src/lib/pubkey/rsa/rsa.h b/src/lib/pubkey/rsa/rsa.h index eb128d413..4d20dce8c 100644 --- a/src/lib/pubkey/rsa/rsa.h +++ b/src/lib/pubkey/rsa/rsa.h @@ -85,7 +85,7 @@ class BOTAN_DLL RSA_PrivateKey : public Private_Key, public RSA_PublicKey /** * Load a private key. * @param alg_id the X.509 algorithm identifier - * @param key_bits PKCS #8 structure + * @param key_bits PKCS#1 RSAPrivateKey bits */ RSA_PrivateKey(const AlgorithmIdentifier& alg_id, const secure_vector<uint8_t>& key_bits); |