Merge of ChaCha & Poly1305 fixes
448602dd4 fixed chacha & poly1305 Makefiles for compiling with no-asm
448602dd4 added chacha20-poly1305 speed.c