change prototype of the ecdh KDF: make input parameter const and the outlen argument...

[openssl.git] / apps / ciphers.c

diff --git a/apps/ciphers.c b/apps/ciphers.c
index 9ba1bffd37cbbb8d009379cddf3020314a2901c9..43f0ac594ad4b7b0b50683ffbc3986abf27f441d 100644 (file)
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -69,7 +69,7 @@
 #undef PROG
 #define PROG   ciphers_main
 
-static char *ciphers_usage[]={
+static const char *ciphers_usage[]={
 "usage: ciphers args\n",
 " -v          - verbose mode, a textual listing of the ciphers in SSLeay\n",
 " -ssl2       - SSL2 mode\n",
@@ -84,7 +84,7 @@ int MAIN(int argc, char **argv)
        {
        int ret=1,i;
        int verbose=0;
-       char **pp;
+       const char **pp;
        const char *p;
        int badops=0;
        SSL_CTX *ctx=NULL;
@@ -108,7 +108,7 @@ int MAIN(int argc, char **argv)
        if (bio_err == NULL)
                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
        STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS
        {
        BIO *tmpbio = BIO_new(BIO_f_linebuffer());
        STDout = BIO_push(tmpbio, STDout);
@@ -187,7 +187,7 @@ int MAIN(int argc, char **argv)
                        {
                        BIO_puts(STDout,SSL_CIPHER_description(
                                sk_SSL_CIPHER_value(sk,i),
-                               buf,512));
+                               buf,sizeof buf));
                        }
                }
 
@@ -202,6 +202,7 @@ end:
        if (ctx != NULL) SSL_CTX_free(ctx);
        if (ssl != NULL) SSL_free(ssl);
        if (STDout != NULL) BIO_free_all(STDout);
-       EXIT(ret);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }