aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/prov/pkcs11
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/prov/pkcs11')
-rw-r--r--src/lib/prov/pkcs11/p11.h47
-rw-r--r--src/lib/prov/pkcs11/p11_mechanism.h4
-rw-r--r--src/lib/prov/pkcs11/p11_randomgenerator.cpp4
3 files changed, 39 insertions, 16 deletions
diff --git a/src/lib/prov/pkcs11/p11.h b/src/lib/prov/pkcs11/p11.h
index a1f85af45..dfd89bb0f 100644
--- a/src/lib/prov/pkcs11/p11.h
+++ b/src/lib/prov/pkcs11/p11.h
@@ -1156,8 +1156,11 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
padded_label.insert(padded_label.end(), 32 - label.size(), ' ');
}
- return C_InitToken(slot_id, reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(so_pin.data())),
- so_pin.size(), reinterpret_cast< Utf8Char* >(const_cast< char* >(padded_label.c_str())), return_value);
+ return C_InitToken(slot_id,
+ reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(so_pin.data())),
+ static_cast<Ulong>(so_pin.size()),
+ reinterpret_cast< Utf8Char* >(const_cast< char* >(padded_label.c_str())),
+ return_value);
}
/**
@@ -1252,8 +1255,10 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
ReturnValue* return_value = ThrowException) const
{
return C_SetPIN(session,
- reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(old_pin.data())), old_pin.size(),
- reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(new_pin.data())), new_pin.size(),
+ reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(old_pin.data())),
+ static_cast<Ulong>(old_pin.size()),
+ reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(new_pin.data())),
+ static_cast<Ulong>(new_pin.size()),
return_value);
}
@@ -1423,7 +1428,9 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
const std::vector<uint8_t, TAlloc>& pin,
ReturnValue* return_value = ThrowException) const
{
- return C_Login(session, user_type, reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(pin.data())), pin.size(),
+ return C_Login(session, user_type,
+ reinterpret_cast< Utf8Char* >(const_cast< uint8_t* >(pin.data())),
+ static_cast<Ulong>(pin.size()),
return_value);
}
@@ -1583,8 +1590,11 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
getter_template.emplace_back(Attribute{ static_cast< CK_ATTRIBUTE_TYPE >(entry.first), nullptr, 0 });
}
- bool success = C_GetAttributeValue(session, object, const_cast< Attribute* >(getter_template.data()),
- getter_template.size(), return_value);
+ bool success = C_GetAttributeValue(session,
+ object,
+ const_cast< Attribute* >(getter_template.data()),
+ static_cast<Ulong>(getter_template.size()),
+ return_value);
if(!success)
{
@@ -1600,7 +1610,9 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
i++;
}
- return C_GetAttributeValue(session, object, const_cast< Attribute* >(getter_template.data()), getter_template.size(),
+ return C_GetAttributeValue(session, object,
+ const_cast< Attribute* >(getter_template.data()),
+ static_cast<Ulong>(getter_template.size()),
return_value);
}
@@ -1658,7 +1670,9 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
setter_template.emplace_back(Attribute{ static_cast< CK_ATTRIBUTE_TYPE >(entry.first), entry.second.data(), static_cast<CK_ULONG>(entry.second.size()) });
}
- return C_SetAttributeValue(session, object, const_cast< Attribute* >(setter_template.data()), setter_template.size(),
+ return C_SetAttributeValue(session, object,
+ const_cast< Attribute* >(setter_template.data()),
+ static_cast<Ulong>(setter_template.size()),
return_value);
}
@@ -1790,7 +1804,10 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
ReturnValue* return_value = ThrowException) const
{
Ulong encrypted_size = 0;
- if(!C_Encrypt(session, const_cast<Byte*>((plaintext_data.data())), plaintext_data.size(), nullptr, &encrypted_size,
+ if(!C_Encrypt(session,
+ const_cast<Byte*>((plaintext_data.data())),
+ static_cast<Ulong>(plaintext_data.size()),
+ nullptr, &encrypted_size,
return_value))
{
return false;
@@ -1917,7 +1934,10 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
ReturnValue* return_value = ThrowException) const
{
Ulong decrypted_size = 0;
- if(!C_Decrypt(session, const_cast<Byte*>((encrypted_data.data())), encrypted_data.size(), nullptr, &decrypted_size,
+ if(!C_Decrypt(session,
+ const_cast<Byte*>((encrypted_data.data())),
+ static_cast<Ulong>(encrypted_data.size()),
+ nullptr, &decrypted_size,
return_value))
{
return false;
@@ -2197,7 +2217,10 @@ class BOTAN_PUBLIC_API(2,0) LowLevel
const std::vector<uint8_t, TAlloc>& part,
ReturnValue* return_value = ThrowException) const
{
- return C_SignUpdate(session, const_cast<Byte*>(part.data()), part.size(), return_value);
+ return C_SignUpdate(session,
+ const_cast<Byte*>(part.data()),
+ static_cast<Ulong>(part.size()),
+ return_value);
}
/**
diff --git a/src/lib/prov/pkcs11/p11_mechanism.h b/src/lib/prov/pkcs11/p11_mechanism.h
index 80f2f8ec9..035d1e69a 100644
--- a/src/lib/prov/pkcs11/p11_mechanism.h
+++ b/src/lib/prov/pkcs11/p11_mechanism.h
@@ -66,7 +66,7 @@ class MechanismWrapper final
inline void set_ecdh_salt(const uint8_t salt[], size_t salt_len)
{
m_parameters->ecdh_params.pSharedData = const_cast<uint8_t*>(salt);
- m_parameters->ecdh_params.ulSharedDataLen = salt_len;
+ m_parameters->ecdh_params.ulSharedDataLen = static_cast<Ulong>(salt_len);
}
/**
@@ -77,7 +77,7 @@ class MechanismWrapper final
inline void set_ecdh_other_key(const uint8_t other_key[], size_t other_key_len)
{
m_parameters->ecdh_params.pPublicData = const_cast<uint8_t*>(other_key);
- m_parameters->ecdh_params.ulPublicDataLen = other_key_len;
+ m_parameters->ecdh_params.ulPublicDataLen = static_cast<Ulong>(other_key_len);
}
/// @return a pointer to the CK_MECHANISM struct that can be passed to the cryptoki functions
diff --git a/src/lib/prov/pkcs11/p11_randomgenerator.cpp b/src/lib/prov/pkcs11/p11_randomgenerator.cpp
index 957a33cae..2f4e4c2ec 100644
--- a/src/lib/prov/pkcs11/p11_randomgenerator.cpp
+++ b/src/lib/prov/pkcs11/p11_randomgenerator.cpp
@@ -18,12 +18,12 @@ PKCS11_RNG::PKCS11_RNG(Session& session)
void PKCS11_RNG::randomize(uint8_t output[], std::size_t length)
{
- module()->C_GenerateRandom(m_session.get().handle(), output, length);
+ module()->C_GenerateRandom(m_session.get().handle(), output, Ulong(length));
}
void PKCS11_RNG::add_entropy(const uint8_t in[], std::size_t length)
{
- module()->C_SeedRandom(m_session.get().handle(), const_cast<uint8_t*>(in), length);
+ module()->C_SeedRandom(m_session.get().handle(), const_cast<uint8_t*>(in), Ulong(length));
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 07:59:24 +0000