Address two issues #2764

Job	Run time
build_and_test (mbedtls, alloc)	7m 46s
build_and_test (mbedtls, os)	9m 30s
build_and_test (rustcrypto, os)	24m 20s
build_and_test (rustcrypto, alloc)	6m 44s
build_and_test (mbedtls)	7m 45s
build_and_test (rustcrypto)	9m 53s
build_and_test (openssl, alloc)	7m 3s
build_and_test (openssl)	6m 56s
build_and_test (openssl, os)	10m 27s
	1h 30m 24s

Provide feedback