NXP-14868: cleanup and factorization

Explicit call to required MD5 digest rather than default