summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorjsing <>2014-05-02 18:06:12 +0000
committerjsing <>2014-05-02 18:06:12 +0000
commit9dc9a083ef7fe522cd6114c696b0ba0cbe86de13 (patch)
tree30b4b074da312e6fb58f05dc436427b16400fff9 /src/lib
parent56fd101f7a0376d5b8219c22b414ba9f89a737cd (diff)
downloadopenbsd-9dc9a083ef7fe522cd6114c696b0ba0cbe86de13.tar.gz
openbsd-9dc9a083ef7fe522cd6114c696b0ba0cbe86de13.tar.bz2
openbsd-9dc9a083ef7fe522cd6114c696b0ba0cbe86de13.zip
Add ChaCha as a cipher.
ok beck@ miod@
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libssl/src/apps/progs.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/libssl/src/apps/progs.h b/src/lib/libssl/src/apps/progs.h
index 59a7b78712..7fb346e7e5 100644
--- a/src/lib/libssl/src/apps/progs.h
+++ b/src/lib/libssl/src/apps/progs.h
@@ -186,6 +186,9 @@ FUNCTION functions[] = {
186 { FUNC_TYPE_CIPHER, "cast5-ofb", enc_main }, 186 { FUNC_TYPE_CIPHER, "cast5-ofb", enc_main },
187 { FUNC_TYPE_CIPHER, "cast-cbc", enc_main }, 187 { FUNC_TYPE_CIPHER, "cast-cbc", enc_main },
188#endif 188#endif
189#ifndef OPENSSL_NO_CHACHA
190 { FUNC_TYPE_CIPHER, "chacha", enc_main },
191#endif
189#ifndef OPENSSL_NO_DES 192#ifndef OPENSSL_NO_DES
190 { FUNC_TYPE_CIPHER, "des", enc_main }, 193 { FUNC_TYPE_CIPHER, "des", enc_main },
191 { FUNC_TYPE_CIPHER, "des3", enc_main }, 194 { FUNC_TYPE_CIPHER, "des3", enc_main },