diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-18 18:33:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-18 18:33:27 +0200 |
| commit | e366fa435032db1ce1538a2c029714666985dd48 (patch) | |
| tree | d08bab02ba212339e4cfc0f2e3666435dd795b90 /include/net | |
| parent | net: mdio: remove duplicated include from mdio_bus.c (diff) | |
| parent | Merge gitolite.kernel.org:/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-e366fa435032db1ce1538a2c029714666985dd48.tar.xz linux-e366fa435032db1ce1538a2c029714666985dd48.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Two new tls tests added in parallel in both net and net-next.
Used Stephen Rothwell's linux-next resolution.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/tls.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/net/tls.h b/include/net/tls.h index 8630d28bd951..9f3c4ea9ad6f 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -173,15 +173,14 @@ struct cipher_context { char *rec_seq; }; +union tls_crypto_context { + struct tls_crypto_info info; + struct tls12_crypto_info_aes_gcm_128 aes_gcm_128; +}; + struct tls_context { - union { - struct tls_crypto_info crypto_send; - struct tls12_crypto_info_aes_gcm_128 crypto_send_aes_gcm_128; - }; - union { - struct tls_crypto_info crypto_recv; - struct tls12_crypto_info_aes_gcm_128 crypto_recv_aes_gcm_128; - }; + union tls_crypto_context crypto_send; + union tls_crypto_context crypto_recv; struct list_head list; struct net_device *netdev; @@ -369,8 +368,8 @@ static inline void tls_fill_prepend(struct tls_context *ctx, * size KTLS_DTLS_HEADER_SIZE + KTLS_DTLS_NONCE_EXPLICIT_SIZE */ buf[0] = record_type; - buf[1] = TLS_VERSION_MINOR(ctx->crypto_send.version); - buf[2] = TLS_VERSION_MAJOR(ctx->crypto_send.version); + buf[1] = TLS_VERSION_MINOR(ctx->crypto_send.info.version); + buf[2] = TLS_VERSION_MAJOR(ctx->crypto_send.info.version); /* we can use IV for nonce explicit according to spec */ buf[3] = pkt_len >> 8; buf[4] = pkt_len & 0xFF; |