aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/prov/pkcs11/p11_ecc_key.h
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-12-11 15:28:38 -0500
committerJack Lloyd <[email protected]>2016-12-18 16:48:24 -0500
commitf3cb3edb512bdcab498d825886c3366c341b3f78 (patch)
tree645c73ec295a5a34f25d99903b6d9fa9751e86d3 /src/lib/prov/pkcs11/p11_ecc_key.h
parentc1dd21253c1f3188ff45d3ad47698efd08235ae8 (diff)
Convert to using standard uintN_t integer types
Renames a couple of functions for somewhat better name consistency, eg make_u32bit becomes make_uint32. The old typedefs remain for now since probably lots of application code uses them.
Diffstat (limited to 'src/lib/prov/pkcs11/p11_ecc_key.h')
-rw-r--r--src/lib/prov/pkcs11/p11_ecc_key.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/prov/pkcs11/p11_ecc_key.h b/src/lib/prov/pkcs11/p11_ecc_key.h
index 69e612c33..6762d448e 100644
--- a/src/lib/prov/pkcs11/p11_ecc_key.h
+++ b/src/lib/prov/pkcs11/p11_ecc_key.h
@@ -30,16 +30,16 @@ class BOTAN_DLL EC_PublicKeyGenerationProperties final : public PublicKeyPropert
{
public:
/// @param ec_params DER-encoding of an ANSI X9.62 Parameters value
- EC_PublicKeyGenerationProperties(const std::vector<byte>& ec_params);
+ EC_PublicKeyGenerationProperties(const std::vector<uint8_t>& ec_params);
/// @return the DER-encoding of the ec parameters according to ANSI X9.62
- inline const std::vector<byte>& ec_params() const
+ inline const std::vector<uint8_t>& ec_params() const
{
return m_ec_params;
}
private:
- const std::vector<byte> m_ec_params;
+ const std::vector<uint8_t> m_ec_params;
};
/// Properties for importing a PKCS#11 EC public key
@@ -50,23 +50,23 @@ class BOTAN_DLL EC_PublicKeyImportProperties final : public PublicKeyProperties
* @param ec_params DER-encoding of an ANSI X9.62 Parameters value
* @param ec_point DER-encoding of ANSI X9.62 ECPoint value Q
*/
- EC_PublicKeyImportProperties(const std::vector<byte>& ec_params, const std::vector<byte>& ec_point);
+ EC_PublicKeyImportProperties(const std::vector<uint8_t>& ec_params, const std::vector<uint8_t>& ec_point);
/// @return the DER-encoding of the ec parameters according to ANSI X9.62
- inline const std::vector<byte>& ec_params() const
+ inline const std::vector<uint8_t>& ec_params() const
{
return m_ec_params;
}
/// @return the DER-encoding of the ec public point according to ANSI X9.62
- inline const std::vector<byte>& ec_point() const
+ inline const std::vector<uint8_t>& ec_point() const
{
return m_ec_point;
}
private:
- const std::vector<byte> m_ec_params;
- const std::vector<byte> m_ec_point;
+ const std::vector<uint8_t> m_ec_params;
+ const std::vector<uint8_t> m_ec_point;
};
/// Represents a PKCS#11 EC public key
@@ -108,10 +108,10 @@ class BOTAN_DLL EC_PrivateKeyImportProperties final : public PrivateKeyPropertie
* @param ec_params DER-encoding of an ANSI X9.62 Parameters value
* @param value ANSI X9.62 private value d
*/
- EC_PrivateKeyImportProperties(const std::vector<byte>& ec_params, const BigInt& value);
+ EC_PrivateKeyImportProperties(const std::vector<uint8_t>& ec_params, const BigInt& value);
/// @return the DER-encoding of the ec parameters according to ANSI X9.62
- inline const std::vector<byte>& ec_params() const
+ inline const std::vector<uint8_t>& ec_params() const
{
return m_ec_params;
}
@@ -123,7 +123,7 @@ class BOTAN_DLL EC_PrivateKeyImportProperties final : public PrivateKeyPropertie
}
private:
- const std::vector<byte> m_ec_params;
+ const std::vector<uint8_t> m_ec_params;
const BigInt m_value;
};
@@ -157,7 +157,7 @@ class BOTAN_DLL PKCS11_EC_PrivateKey : public virtual Private_Key,
* @param props the attributes of the private key
* @note no persistent public key object will be created
*/
- PKCS11_EC_PrivateKey(Session& session, const std::vector<byte>& ec_params,
+ PKCS11_EC_PrivateKey(Session& session, const std::vector<uint8_t>& ec_params,
const EC_PrivateKeyGenerationProperties& props);
/// @returns the domain of the EC private key
@@ -201,7 +201,7 @@ class BOTAN_DLL PKCS11_EC_PrivateKey : public virtual Private_Key,
// Private_Key methods
- std::vector<byte> public_key_bits() const override;
+ std::vector<uint8_t> public_key_bits() const override;
std::size_t key_length() const override;