Fixes for pqc and crypto refresh #3259

Job	Run time
ubuntu-latest [CC gcc; botan; shared libs on; GnuPG stable]	4m 26s
ubuntu-latest [CC clang; botan; shared libs on; GnuPG stable]	4m 9s
cmake-offline-googletest	4m 14s
ubuntu-latest [CC gcc; openssl; shared libs on; GnuPG stable]	4m 49s
ubuntu-latest [CC clang; openssl; shared libs on; GnuPG stable]	4m 38s
ubuntu-20.04 [CC gcc; openssl; shared libs on; GnuPG stable]	3m 42s
cmake-offline-googletest-src	4m 28s
ubuntu-latest [CC gcc; botan; shared libs off; GnuPG stable]	4m 29s
system-sexpp, sexpp shared libs on, rnp shared libs on	3m 15s
package-source	39s
system-sexpp, sexpp shared libs on, rnp shared libs off	3m 1s
system-sexpp, sexpp shared libs off, rnp shared libs on	2m 41s
system-sexpp, sexpp shared libs off, rnp shared libs off	2m 51s
package	50s
debian-tests	8s
	48m 20s

Provide feedback