Drop SHA-1 patch
Also adjust l_e and l_v to meet the constraints