diff options
author | lloyd <[email protected]> | 2010-10-13 02:45:00 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-10-13 02:45:00 +0000 |
commit | 63121e1e169616f724bf79b8aac1a2b4423c8904 (patch) | |
tree | 2375d5b5daaad8990b2cee951d137f2e7638e79b /src/kdf | |
parent | 879d062c2b93e32362e338d1c6f9b1eda0f88493 (diff) |
Use output_length() instead of OUTPUT_LENGTH pseudo-property
Diffstat (limited to 'src/kdf')
-rw-r--r-- | src/kdf/ssl_prf/prf_ssl3.cpp | 4 | ||||
-rw-r--r-- | src/kdf/tls_prf/prf_tls.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/kdf/ssl_prf/prf_ssl3.cpp b/src/kdf/ssl_prf/prf_ssl3.cpp index 27afd9744..4f7325bde 100644 --- a/src/kdf/ssl_prf/prf_ssl3.cpp +++ b/src/kdf/ssl_prf/prf_ssl3.cpp @@ -25,7 +25,7 @@ OctetString next_hash(size_t where, size_t want, const byte secret[], size_t secret_len, const byte seed[], size_t seed_len) { - BOTAN_ASSERT(want <= md5.OUTPUT_LENGTH, "Desired output too large"); + BOTAN_ASSERT(want <= md5.output_length(), "Desired output too large"); const byte ASCII_A_CHAR = 0x41; @@ -62,7 +62,7 @@ SecureVector<byte> SSL3_PRF::derive(size_t key_len, int counter = 0; while(key_len) { - const size_t produce = std::min<size_t>(key_len, md5.OUTPUT_LENGTH); + const size_t produce = std::min<size_t>(key_len, md5.output_length()); output = output + next_hash(counter++, produce, md5, sha1, secret, secret_len, seed, seed_len); diff --git a/src/kdf/tls_prf/prf_tls.cpp b/src/kdf/tls_prf/prf_tls.cpp index 97e952b0a..872997c28 100644 --- a/src/kdf/tls_prf/prf_tls.cpp +++ b/src/kdf/tls_prf/prf_tls.cpp @@ -32,7 +32,7 @@ void P_hash(MemoryRegion<byte>& output, while(offset != output.size()) { const size_t this_block_len = - std::min<size_t>(mac->OUTPUT_LENGTH, output.size() - offset); + std::min<size_t>(mac->output_length(), output.size() - offset); A = mac->process(A); |