diff options
| author | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2006-10-09 16:47:10 +0000 |
| commit | 4043d7db4e466d15193c3bad3b204048fc13b785 (patch) | |
| tree | 8156ce31a6e4a155fc240551f48c23b5a42a6e5e /openssl/trunk/apps/openssl.c | |
| parent | aba277548b76071e75fc9478002a6fc2145f64f1 (diff) | |
Merged in changes from OpenSSL 0.9.8d
svn path=/openssl/trunk/CHANGES; revision=377
Diffstat (limited to 'openssl/trunk/apps/openssl.c')
| -rw-r--r-- | openssl/trunk/apps/openssl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/openssl/trunk/apps/openssl.c b/openssl/trunk/apps/openssl.c index 02d86d54..47aee5b7 100644 --- a/openssl/trunk/apps/openssl.c +++ b/openssl/trunk/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; |