update
Merge branch 'master' of https://github.com/rockyxshen/block_cipher

Conflicts:
	keygen.txt
	result.txt
	util.o