diff options
author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:29:05 +0000 |
commit | 1b2aa7959c86a835491c8cfca8c0683b747c1855 (patch) | |
tree | 9a0ba58647a2d57115f5c003ca4673e7693c950a /openssl/vendor/current/apps/progs.h | |
parent | 084adb601f2d375395c6cdcedf8af91f1065fe4e (diff) |
Merge in vendor branch OpenSSL changes 0.9.8b -> 0.9.8d
svn path=/openssl/vendor/current/CHANGES; revision=375
Diffstat (limited to 'openssl/vendor/current/apps/progs.h')
-rw-r--r-- | openssl/vendor/current/apps/progs.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/openssl/vendor/current/apps/progs.h b/openssl/vendor/current/apps/progs.h index dc665c53..011974b2 100644 --- a/openssl/vendor/current/apps/progs.h +++ b/openssl/vendor/current/apps/progs.h @@ -166,6 +166,24 @@ FUNCTION functions[] = { #ifndef OPENSSL_NO_AES {FUNC_TYPE_CIPHER,"aes-256-ecb",enc_main}, #endif +#ifndef OPENSSL_NO_CAMELLIA + {FUNC_TYPE_CIPHER,"camellia-128-cbc",enc_main}, +#endif +#ifndef OPENSSL_NO_CAMELLIA + {FUNC_TYPE_CIPHER,"camellia-128-ecb",enc_main}, +#endif +#ifndef OPENSSL_NO_CAMELLIA + {FUNC_TYPE_CIPHER,"camellia-192-cbc",enc_main}, +#endif +#ifndef OPENSSL_NO_CAMELLIA + {FUNC_TYPE_CIPHER,"camellia-192-ecb",enc_main}, +#endif +#ifndef OPENSSL_NO_CAMELLIA + {FUNC_TYPE_CIPHER,"camellia-256-cbc",enc_main}, +#endif +#ifndef OPENSSL_NO_CAMELLIA + {FUNC_TYPE_CIPHER,"camellia-256-ecb",enc_main}, +#endif {FUNC_TYPE_CIPHER,"base64",enc_main}, #ifndef OPENSSL_NO_DES {FUNC_TYPE_CIPHER,"des",enc_main}, |