aboutsummaryrefslogtreecommitdiffstats
path: root/src/tls/tls_session.h
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-03-16 17:47:58 +0000
committerlloyd <[email protected]>2012-03-16 17:47:58 +0000
commitb1238320b591bced237ab08bd32713c59d18525a (patch)
tree46cf73f2961e59054bda3f76bd57661e56a6a743 /src/tls/tls_session.h
parent79119349636d195f8787384b72a7fc3f6935d784 (diff)
Various merge fixups.
Use AES-256 so we don't encrypt session tickets with a weaker algo than the ciphersuites.
Diffstat (limited to 'src/tls/tls_session.h')
-rw-r--r--src/tls/tls_session.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tls/tls_session.h b/src/tls/tls_session.h
index 40aaee278..64a83367e 100644
--- a/src/tls/tls_session.h
+++ b/src/tls/tls_session.h
@@ -78,9 +78,9 @@ class BOTAN_DLL Session
const MemoryRegion<byte>& key_name,
RandomNumberGenerator& rng);
- static TLS_Session decrypt(const MemoryRegion<byte>& ctext,
- const SymmetricKey& key,
- const MemoryRegion<byte>& key_name);
+ static Session decrypt(const MemoryRegion<byte>& ctext,
+ const SymmetricKey& key,
+ const MemoryRegion<byte>& key_name);
/**
* Encode this session data for storage