From: jsing <jsing@openbsd.org>
Date: Fri, 2 May 2014 18:06:12 +0000 (+0000)
Subject: Add ChaCha as a cipher.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=01f1cebe9699b8e6152b960e96e434be84a55a2c;p=openbsd

Add ChaCha as a cipher.

ok beck@ miod@
---

diff --git a/lib/libssl/src/apps/progs.h b/lib/libssl/src/apps/progs.h
index 59a7b787126..7fb346e7e54 100644
--- a/lib/libssl/src/apps/progs.h
+++ b/lib/libssl/src/apps/progs.h
@@ -186,6 +186,9 @@ FUNCTION functions[] = {
 	{ FUNC_TYPE_CIPHER, "cast5-ofb", enc_main },
 	{ FUNC_TYPE_CIPHER, "cast-cbc", enc_main },
 #endif
+#ifndef OPENSSL_NO_CHACHA
+	{ FUNC_TYPE_CIPHER, "chacha", enc_main },
+#endif
 #ifndef OPENSSL_NO_DES
 	{ FUNC_TYPE_CIPHER, "des", enc_main },
 	{ FUNC_TYPE_CIPHER, "des3", enc_main },