Make update to bring in all the cipher/digest-related ENGINE changes.

NB: It looks like mkdef.pl is causing certain cvs wars by continually
flipping the order of some definitions ...