fix warnings when GCM crypto is not available
remove unused variable
Merge branch 'master' into portable
log.h required by fatal()