Audit implicit mac, if mac is covered in cipher (#1271694)
For example chacha20-poly1305@openssh.com is AEAD (Authenticated Encryption with Associated Data) cipher and thus there is no separate MAC when it is used.
This commit is contained in:
parent
0ebe96b604
commit
aa9a7754ed
@ -1569,7 +1569,7 @@ diff -up openssh-7.0p1/monitor_wrap.c.audit openssh-7.0p1/monitor_wrap.c
|
|||||||
+ buffer_init(&m);
|
+ buffer_init(&m);
|
||||||
+ buffer_put_int(&m, ctos);
|
+ buffer_put_int(&m, ctos);
|
||||||
+ buffer_put_cstring(&m, cipher);
|
+ buffer_put_cstring(&m, cipher);
|
||||||
+ buffer_put_cstring(&m, (mac ? mac : ""));
|
+ buffer_put_cstring(&m, (mac ? mac : "<implicit>"));
|
||||||
+ buffer_put_cstring(&m, compress);
|
+ buffer_put_cstring(&m, compress);
|
||||||
+ buffer_put_cstring(&m, fps);
|
+ buffer_put_cstring(&m, fps);
|
||||||
+ buffer_put_int64(&m, pid);
|
+ buffer_put_int64(&m, pid);
|
||||||
|
Loading…
Reference in New Issue
Block a user