diff options
author | doug <> | 2014-10-03 06:02:38 +0000 |
---|---|---|
committer | doug <> | 2014-10-03 06:02:38 +0000 |
commit | 079e384e3438a23d2ddc504f4d34e5a46d9dd6e8 (patch) | |
tree | ec58ae0912470726cdc0183e7bc10028ba918120 /src/lib/libssl/ssl_ciph.c | |
parent | 8b25549254bce5b7fc083b5930f89878aa04174f (diff) | |
download | openbsd-079e384e3438a23d2ddc504f4d34e5a46d9dd6e8.tar.gz openbsd-079e384e3438a23d2ddc504f4d34e5a46d9dd6e8.tar.bz2 openbsd-079e384e3438a23d2ddc504f4d34e5a46d9dd6e8.zip |
Use string literals in printf style calls so gcc's -Wformat works.
ok tedu@, miod@
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
-rw-r--r-- | src/lib/libssl/ssl_ciph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 586ae13974..35e81e18f1 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_ciph.c,v 1.68 2014/09/19 16:02:35 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_ciph.c,v 1.69 2014/10/03 06:02:38 doug Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1559,7 +1559,6 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method, | |||
1559 | char * | 1559 | char * |
1560 | SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) | 1560 | SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) |
1561 | { | 1561 | { |
1562 | static const char *fmt="%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s\n"; | ||
1563 | unsigned long alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl, alg2; | 1562 | unsigned long alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl, alg2; |
1564 | const char *ver, *kx, *au, *enc, *mac; | 1563 | const char *ver, *kx, *au, *enc, *mac; |
1565 | char *ret; | 1564 | char *ret; |
@@ -1692,7 +1691,8 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len) | |||
1692 | break; | 1691 | break; |
1693 | } | 1692 | } |
1694 | 1693 | ||
1695 | if (asprintf(&ret, fmt, cipher->name, ver, kx, au, enc, mac) == -1) | 1694 | if (asprintf(&ret, "%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s\n", |
1695 | cipher->name, ver, kx, au, enc, mac) == -1) | ||
1696 | return "OPENSSL_malloc Error"; | 1696 | return "OPENSSL_malloc Error"; |
1697 | 1697 | ||
1698 | if (buf != NULL) { | 1698 | if (buf != NULL) { |