Merge in the ADH-AES128-SHA changes and add a check for it during the
packet order sanity checking.