diff options
author | Damien Miller <djm@mindrot.org> | 2012-06-30 08:34:59 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-06-30 08:34:59 +1000 |
commit | db4f8e86184ef0e8d14a370a5569a52d8ed28551 (patch) | |
tree | c2664c0607fa20ba11bf3d1f9ce2a1069abd78b2 /myproposal.h | |
parent | 560de922b18fe7fcea8cc837d87cd4609738eb0f (diff) |
- dtucker@cvs.openbsd.org 2012/06/28 05:07:45
[mac.c myproposal.h ssh_config.5 sshd_config.5]
Remove hmac-sha2-256-96 and hmac-sha2-512-96 MACs since they were removed
from draft6 of the spec and will not be in the RFC when published. Patch
from mdb at juniper net via bz#2023, ok markus.
Diffstat (limited to 'myproposal.h')
-rw-r--r-- | myproposal.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/myproposal.h b/myproposal.h index 0bc1c778c..2e6a0dcac 100644 --- a/myproposal.h +++ b/myproposal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: myproposal.h,v 1.28 2011/08/02 01:22:11 djm Exp $ */ | 1 | /* $OpenBSD: myproposal.h,v 1.29 2012/06/28 05:07:45 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -78,9 +78,7 @@ | |||
78 | #ifdef HAVE_EVP_SHA256 | 78 | #ifdef HAVE_EVP_SHA256 |
79 | #define SHA2_HMAC_MODES \ | 79 | #define SHA2_HMAC_MODES \ |
80 | "hmac-sha2-256," \ | 80 | "hmac-sha2-256," \ |
81 | "hmac-sha2-256-96," \ | ||
82 | "hmac-sha2-512," \ | 81 | "hmac-sha2-512," \ |
83 | "hmac-sha2-512-96," | ||
84 | #else | 82 | #else |
85 | # define SHA2_HMAC_MODES | 83 | # define SHA2_HMAC_MODES |
86 | #endif | 84 | #endif |