Crypt/Base: more fixes to pre 5.4.0 padding adjustments