{
int ret=1,i;
int verbose=0,Verbose=0;
+ int use_supported = 0;
+#ifndef OPENSSL_NO_SSL_TRACE
+ int stdname = 0;
+#endif
const char **pp;
const char *p;
int badops=0;
STDout = BIO_push(tmpbio, STDout);
}
#endif
+ if (!load_config(bio_err, NULL))
+ goto end;
argc--;
argv++;
verbose=1;
else if (strcmp(*argv,"-V") == 0)
verbose=Verbose=1;
+ else if (strcmp(*argv,"-s") == 0)
+ use_supported = 1;
+#ifndef OPENSSL_NO_SSL_TRACE
+ else if (strcmp(*argv,"-stdname") == 0)
+ stdname=verbose=1;
+#endif
#ifndef OPENSSL_NO_SSL2
else if (strcmp(*argv,"-ssl2") == 0)
meth=SSLv2_client_method();
ssl=SSL_new(ctx);
if (ssl == NULL) goto err;
+ if (use_supported)
+ sk=SSL_get1_supported_ciphers(ssl);
+ else
+ sk=SSL_get_ciphers(ssl);
if (!verbose)
{
- for (i=0; ; i++)
+ for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
{
- p=SSL_get_cipher_list(ssl,i);
+ SSL_CIPHER *c = sk_SSL_CIPHER_value(sk,i);
+ p = SSL_CIPHER_get_name(c);
if (p == NULL) break;
if (i != 0) BIO_printf(STDout,":");
BIO_printf(STDout,"%s",p);
}
else /* verbose */
{
- sk=SSL_get_ciphers(ssl);
for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
{
if (Verbose)
{
- unsigned long id = c->id;
+ unsigned long id = SSL_CIPHER_get_id(c);
int id0 = (int)(id >> 24);
int id1 = (int)((id >> 16) & 0xffL);
int id2 = (int)((id >> 8) & 0xffL);
else
BIO_printf(STDout, "0x%02X,0x%02X,0x%02X,0x%02X - ", id0, id1, id2, id3); /* whatever */
}
-
+#ifndef OPENSSL_NO_SSL_TRACE
+ if (stdname)
+ {
+ const char *nm = SSL_CIPHER_standard_name(c);
+ if (nm == NULL)
+ nm = "UNKNOWN";
+ BIO_printf(STDout, "%s - ", nm);
+ }
+#endif
BIO_puts(STDout,SSL_CIPHER_description(c,buf,sizeof buf));
}
}
ERR_print_errors(bio_err);
}
end:
+ if (use_supported && sk)
+ sk_SSL_CIPHER_free(sk);
if (ctx != NULL) SSL_CTX_free(ctx);
if (ssl != NULL) SSL_free(ssl);
if (STDout != NULL) BIO_free_all(STDout);