diff options
| author | Juraj Somorovsky <[email protected]> | 2016-05-12 23:40:49 +0200 |
|---|---|---|
| committer | Juraj Somorovsky <[email protected]> | 2016-05-12 23:40:49 +0200 |
| commit | 7dd73a96bbea879a6d7107bf4b23a44ba527a134 (patch) | |
| tree | 34cfb60fa6f8d8535a3e51cd9ab1dec62fe32596 /src/lib/tls/msg_cert_verify.cpp | |
| parent | 7c7fcecbe6a94ffaba5752175d8da5e33fbf0d7b (diff) | |
| parent | 8578e0fc758b81d176d0c5092417f4cc77676895 (diff) | |
Merge branch 'master' into Encrypt-then-MAC-with-policy
Merged recent changes and resolved minor conflicts in tls record classes.
Diffstat (limited to 'src/lib/tls/msg_cert_verify.cpp')
| -rw-r--r-- | src/lib/tls/msg_cert_verify.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/tls/msg_cert_verify.cpp b/src/lib/tls/msg_cert_verify.cpp index 0d157dc57..2598255eb 100644 --- a/src/lib/tls/msg_cert_verify.cpp +++ b/src/lib/tls/msg_cert_verify.cpp @@ -65,7 +65,7 @@ std::vector<byte> Certificate_Verify::serialize() const buf.push_back(Signature_Algorithms::sig_algo_code(m_sig_algo)); } - const u16bit sig_len = m_signature.size(); + const u16bit sig_len = static_cast<u16bit>(m_signature.size()); buf.push_back(get_byte(0, sig_len)); buf.push_back(get_byte(1, sig_len)); buf += m_signature; |