diff options
author | lloyd <[email protected]> | 2013-12-19 22:56:51 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2013-12-19 22:56:51 +0000 |
commit | 18b334f7dfeb03138d61ea63ca4383fd19be0109 (patch) | |
tree | f27b7233be0c44efddaf02d360edaaff659fdcc2 /doc | |
parent | 63c2bc18081aaa25785438f36ab144c8c448e3fc (diff) | |
parent | 03d02309753b1a6c2e512bff27dca190e8f64e5c (diff) |
merge of 'c55938af0026b98297194116c1553d467104b41a'
and 'd0c532af92ea0940685dd0e99d2946329efbc917'
Diffstat (limited to 'doc')
-rw-r--r-- | doc/aead.rst | 6 | ||||
-rw-r--r-- | doc/examples/cpuid.cpp | 7 | ||||
-rw-r--r-- | doc/relnotes/1_11_6.rst | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/doc/aead.rst b/doc/aead.rst index cb49f8a51..dbd06bbe1 100644 --- a/doc/aead.rst +++ b/doc/aead.rst @@ -81,3 +81,9 @@ AEAD modes currently available include GCM, OCB, and EAX. All three use a Returns true if *nonce_len* is a valid nonce length for this scheme. For EAX and GCM, any length nonces are allowed. OCB allows any value between 8 and 15 bytes. + + .. cpp:function:: size_t default_nonce_length() const + + Returns a reasonable length for the nonce, typically either 96 + bits, or the only supported length for modes which don't + support 96 bit nonces. diff --git a/doc/examples/cpuid.cpp b/doc/examples/cpuid.cpp index ac3f50580..9ffb810a9 100644 --- a/doc/examples/cpuid.cpp +++ b/doc/examples/cpuid.cpp @@ -35,12 +35,15 @@ int main() print_if_feature("SSSE3", CPUID::has_ssse3()); print_if_feature("SSE4.1", CPUID::has_sse41()); print_if_feature("SSE4.2", CPUID::has_sse42()); - print_if_feature("AVX", CPUID::has_avx()); + print_if_feature("AVX2", CPUID::has_avx2()); + print_if_feature("BMI2", CPUID::has_bmi2()); print_if_feature("AltiVec", CPUID::has_altivec()); print_header("Other extensions"); print_if_feature("RDTSC", CPUID::has_rdtsc()); print_if_feature("PCMUL", CPUID::has_pcmuludq()); print_if_feature("AES-NI", CPUID::has_aes_ni()); - print_if_feature("RDRND", CPUID::has_rdrand()); + print_if_feature("RDRAND", CPUID::has_rdrand()); + print_if_feature("RDSEED", CPUID::has_rdseed()); + print_if_feature("SHA", CPUID::has_intel_sha()); } diff --git a/doc/relnotes/1_11_6.rst b/doc/relnotes/1_11_6.rst index 79b2dca2e..434d8c499 100644 --- a/doc/relnotes/1_11_6.rst +++ b/doc/relnotes/1_11_6.rst @@ -8,7 +8,8 @@ Version 1.11.6, Not Yet Released * Botan now requires Boost, specifically the filesystem and asio libraries. - * The default TLS policy no longer includes RC4 in the cipher list. + * The default TLS policy no longer includes RC4 in the cipher list, and + refuses to negotation SSLv3 by default. * Add HKDF from :rfc:`5869` |