diff options
| author | djm <djm> | 2007-06-11 04:01:42 +0000 |
|---|---|---|
| committer | djm <djm> | 2007-06-11 04:01:42 +0000 |
| commit | f4c2ce899feb8dd33fb179ceae1d36b2c04ae789 (patch) | |
| tree | 47c10b43540fecda9a871bc84b8c4f286cc1ebce /packet.c | |
| parent | ecf14bbf8e874b7e22f59597ee8471e69261ea1d (diff) | |
| download | openssh-f4c2ce899feb8dd33fb179ceae1d36b2c04ae789.tar.gz | |
- pvalchev@cvs.openbsd.org 2007/06/07 19:37:34
[kex.h mac.c mac.h monitor_wrap.c myproposal.h packet.c ssh.1]
[ssh_config.5 sshd.8 sshd_config.5]
Add a new MAC algorithm for data integrity, UMAC-64 (not default yet,
must specify umac-64@openssh.com). Provides about 20% end-to-end speedup
compared to hmac-md5. Represents a different approach to message
authentication to that of HMAC that may be beneficial if HMAC based on
one of its underlying hash algorithms is found to be vulnerable to a
new attack. http://www.ietf.org/rfc/rfc4418.txt
in conjunction with and OK djm@
Diffstat (limited to 'packet.c')
| -rw-r--r-- | packet.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: packet.c,v 1.147 2007/06/05 06:52:37 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.148 2007/06/07 19:37:34 pvalchev Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -629,8 +629,7 @@ set_newkeys(int mode) enc = &newkeys[mode]->enc; mac = &newkeys[mode]->mac; comp = &newkeys[mode]->comp; - if (mac->md != NULL) - mac_clear(mac); + mac_clear(mac); xfree(enc->name); xfree(enc->iv); xfree(enc->key); @@ -645,10 +644,8 @@ set_newkeys(int mode) enc = &newkeys[mode]->enc; mac = &newkeys[mode]->mac; comp = &newkeys[mode]->comp; - if (mac->md != NULL) { - mac_init(mac); + if (mac_init(mac) == 0) mac->enabled = 1; - } DBG(debug("cipher_init_context: %d", mode)); cipher_init(cc, enc->cipher, enc->key, enc->key_len, enc->iv, enc->block_size, crypt_type); |