cipher if requested [1] - Fix build with clang - Trim Makefile headers Submitted by: Oliver Fromme <olli@grabthar.secnetix.de> [1] Approved by: Gianmarco Giovannelli <gmarco@gufi.org> (maintainer) Feature safe: yes