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/base/symkey.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/base/symkey.cpp')
0 files changed, 0 insertions, 0 deletions