diff options
| author | Bodo Möller <bodo@openssl.org> | 2006-06-09 15:42:21 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2006-06-09 15:42:21 +0000 |
| commit | e18eef3d7ab9a6b4f229d95c8d32d25c66243103 (patch) | |
| tree | 92f77102b848b7c55a29e1a63b8c6d9dfd8781ac /apps/openssl.c | |
| parent | e78fc11a9587091d639473f3c2c68882223418d8 (diff) | |
Camellia cipher, contributed by NTT
Submitted by: Masashi Fujita
Reviewed by: Bodo Moeller
Diffstat (limited to 'apps/openssl.c')
| -rw-r--r-- | apps/openssl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/openssl.c b/apps/openssl.c index 02d86d546d..47aee5b712 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ /* ==================================================================== - * Copyright (c) 1998-2001 The OpenSSL Project. All rights reserved. + * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -445,7 +445,11 @@ static int do_cmd(LHASH *prog, int argc, char *argv[]) for (fp=functions; fp->name != NULL; fp++) { nl=0; +#ifdef OPENSSL_NO_CAMELLIA if (((i++) % 5) == 0) +#else + if (((i++) % 4) == 0) +#endif { BIO_printf(bio_err,"\n"); nl=1; @@ -466,7 +470,11 @@ static int do_cmd(LHASH *prog, int argc, char *argv[]) BIO_printf(bio_err,"\nCipher commands (see the `enc' command for more details)\n"); } } +#ifdef OPENSSL_NO_CAMELLIA BIO_printf(bio_err,"%-15s",fp->name); +#else + BIO_printf(bio_err,"%-18s",fp->name); +#endif } BIO_printf(bio_err,"\n\n"); ret=0; |