block-sha1: move code around