Merge pull request #10357 from sameehj/km-fixes #2530

Job	Run time
make check (--enable-sm2 --enable-sm3 --enable-sm4-gcm --enable-sm4-ccm --enable-sha3)	1m 0s
make check (--enable-all --enable-sm2 --enable-sm3 --enable-sm4-ecb --enable-sm4-cbc --enable-sm4...	2m 54s
make check (--enable-sm2 --enable-sm3 --enable-sm4-ecb --enable-sm4-cbc --enable-sm4-ctr --enable...	1m 1s
	4m 55s

Provide feedback