diff options
| author | des <des@FreeBSD.org> | 2013-03-22 17:55:38 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-03-22 17:55:38 +0000 |
| commit | b291eafe8d40c45b908e0f6481f471ca44a0a2f8 (patch) | |
| tree | dd7d7e2bece2a6008e83b0bf90e7410032c4be13 /crypto/openssh/kex.h | |
| parent | 19db167f418891cf677735a56370ffbcbdb37d67 (diff) | |
| parent | 5a4dbb83324b0cc6594abbb5fcaa8fe0415febc5 (diff) | |
| download | FreeBSD-src-b291eafe8d40c45b908e0f6481f471ca44a0a2f8.zip FreeBSD-src-b291eafe8d40c45b908e0f6481f471ca44a0a2f8.tar.gz | |
Upgrade to OpenSSH 6.2p1. The most important new features are support
for a key revocation list and more fine-grained authentication control.
Diffstat (limited to 'crypto/openssh/kex.h')
| -rw-r--r-- | crypto/openssh/kex.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssh/kex.h b/crypto/openssh/kex.h index fc5bdf6..aa57e06 100644 --- a/crypto/openssh/kex.h +++ b/crypto/openssh/kex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.52 2010/09/22 05:01:29 djm Exp $ */ +/* $OpenBSD: kex.h,v 1.54 2013/01/08 18:49:04 markus Exp $ */ /* $FreeBSD$ */ /* @@ -90,6 +90,7 @@ struct Enc { Cipher *cipher; int enabled; u_int key_len; + u_int iv_len; u_int block_size; u_char *key; u_char *iv; @@ -101,6 +102,7 @@ struct Mac { u_char *key; u_int key_len; int type; + int etm; /* Encrypt-then-MAC */ const EVP_MD *evp_md; HMAC_CTX evp_ctx; struct umac_ctx *umac_ctx; |
