diff options
| author | lloyd <[email protected]> | 2010-10-12 16:23:03 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-10-12 16:23:03 +0000 |
| commit | e3e02712563e03fbfd6b474cfaa7c0dfdf08f267 (patch) | |
| tree | 2d5049051b774cd902b6658781543ce4dc9834fe /src/kdf/x942_prf | |
| parent | 4a6fd8c70d40f88c8b51127bfa055b66b18e0f7a (diff) | |
s/u32bit/size_t/ in kdf
Diffstat (limited to 'src/kdf/x942_prf')
| -rw-r--r-- | src/kdf/x942_prf/prf_x942.cpp | 8 | ||||
| -rw-r--r-- | src/kdf/x942_prf/prf_x942.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/kdf/x942_prf/prf_x942.cpp b/src/kdf/x942_prf/prf_x942.cpp index 35402ad28..966d883b6 100644 --- a/src/kdf/x942_prf/prf_x942.cpp +++ b/src/kdf/x942_prf/prf_x942.cpp @@ -32,9 +32,9 @@ MemoryVector<byte> encode_x942_int(u32bit n) /* * X9.42 PRF */ -SecureVector<byte> X942_PRF::derive(u32bit key_len, - const byte secret[], u32bit secret_len, - const byte salt[], u32bit salt_len) const +SecureVector<byte> X942_PRF::derive(size_t key_len, + const byte secret[], size_t secret_len, + const byte salt[], size_t salt_len) const { SHA_160 hash; const OID kek_algo(key_wrap_oid); @@ -69,7 +69,7 @@ SecureVector<byte> X942_PRF::derive(u32bit key_len, ); SecureVector<byte> digest = hash.final(); - const u32bit needed = std::min(digest.size(), key_len - key.size()); + const size_t needed = std::min(digest.size(), key_len - key.size()); key += std::make_pair(&digest[0], needed); ++counter; diff --git a/src/kdf/x942_prf/prf_x942.h b/src/kdf/x942_prf/prf_x942.h index a5fe9f351..8efc6ea45 100644 --- a/src/kdf/x942_prf/prf_x942.h +++ b/src/kdf/x942_prf/prf_x942.h @@ -18,8 +18,8 @@ namespace Botan { class BOTAN_DLL X942_PRF : public KDF { public: - SecureVector<byte> derive(u32bit, const byte[], u32bit, - const byte[], u32bit) const; + SecureVector<byte> derive(size_t, const byte[], size_t, + const byte[], size_t) const; X942_PRF(const std::string&); private: |