]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@psp-deb1.ntp.org:ntp-stable-aes128cmac
authorHarlan Stenn <stenn@ntp.org>
Tue, 28 Nov 2017 06:36:11 +0000 (22:36 -0800)
committerHarlan Stenn <stenn@ntp.org>
Tue, 28 Nov 2017 06:36:11 +0000 (22:36 -0800)
into  mb6.tal1.ntfo.org:/home/harlan/src/ntp-stable-aes128cmac

bk: 5a1d03db_Y4Y9q5SjN-QwFYafJrm-g

1  2 
sntp/crypto.c
sntp/tests/crypto.c

diff --cc sntp/crypto.c
index 04e34e9e8a04b0b4e661266c8f868da7ff19db62,f4b2d0be9872ba779eed9ec796c28579c511b04f..4335629bb1ceee1e013af0d0729d9c72e86b28b2
@@@ -140,8 -148,8 +148,8 @@@ auth_md5
  {
        int  hash_len;
        int  authentic;
 -      char digest[20];
 +      char digest[MAX_MDG_LEN];
-       const u_char *pkt_ptr; 
+       const u_char *pkt_ptr;
        if (mac_size > (int)sizeof(digest))
                return 0;
        pkt_ptr = pkt_data;
Simple merge