Get rid of a constant that's only used one.
Hash all data for both the signature and packet AD.