diff options
| author |   markus <markus@openbsd.org> | 2012-10-04 13:21:50 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2012-10-04 13:21:50 +0000 |
| commit | 197253e3ef9f0745db16f42cacf8bf1cf1908780 (patch) | |
| tree | 3dd4039f354a3d5a8f56a12219bb1e838340f306 /usr.bin/ssh/mac.c | |
| parent | backout pgroup/job control from make, there is something deeply bogus (diff) | |
| download | wireguard-openbsd-197253e3ef9f0745db16f42cacf8bf1cf1908780.tar.xz wireguard-openbsd-197253e3ef9f0745db16f42cacf8bf1cf1908780.zip | |
add umac128 variant; ok djm@ at n2k12
Diffstat (limited to 'usr.bin/ssh/mac.c')
| -rw-r--r-- | usr.bin/ssh/mac.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/usr.bin/ssh/mac.c b/usr.bin/ssh/mac.c index da4fdbf6318..80b01d8a9bc 100644 --- a/usr.bin/ssh/mac.c +++ b/usr.bin/ssh/mac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mac.c,v 1.18 2012/06/28 05:07:45 dtucker Exp $ */ +/* $OpenBSD: mac.c,v 1.19 2012/10/04 13:21:50 markus Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. * @@ -43,6 +43,7 @@ #define SSH_EVP 1 /* OpenSSL EVP-based MAC */ #define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */ +#define SSH_UMAC128 3 struct { char *name; @@ -61,6 +62,7 @@ struct { { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, -1, -1 }, { "hmac-ripemd160@openssh.com", SSH_EVP, EVP_ripemd160, 0, -1, -1 }, { "umac-64@openssh.com", SSH_UMAC, NULL, 0, 128, 64 }, + { "umac-128@openssh.com", SSH_UMAC128, NULL, 0, 128, 128 }, { NULL, 0, NULL, 0, -1, -1 } }; @@ -115,6 +117,9 @@ mac_init(Mac *mac) case SSH_UMAC: mac->umac_ctx = umac_new(mac->key); return 0; + case SSH_UMAC128: + mac->umac_ctx = umac128_new(mac->key); + return 0; default: return -1; } @@ -144,6 +149,11 @@ mac_compute(Mac *mac, u_int32_t seqno, u_char *data, int datalen) umac_update(mac->umac_ctx, data, datalen); umac_final(mac->umac_ctx, m, nonce); break; + case SSH_UMAC128: + put_u64(nonce, seqno); + umac128_update(mac->umac_ctx, data, datalen); + umac128_final(mac->umac_ctx, m, nonce); + break; default: fatal("mac_compute: unknown MAC type"); } @@ -156,6 +166,9 @@ mac_clear(Mac *mac) if (mac->type == SSH_UMAC) { if (mac->umac_ctx != NULL) umac_delete(mac->umac_ctx); + } else if (mac->type == SSH_UMAC128) { + if (mac->umac_ctx != NULL) + umac128_delete(mac->umac_ctx); } else if (mac->evp_md != NULL) HMAC_cleanup(&mac->evp_ctx); mac->evp_md = NULL; |