summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbcook <>2014-07-09 11:12:13 +0000
committerbcook <>2014-07-09 11:12:13 +0000
commit4afcbff6153d561348af47fa000f298df3693a3c (patch)
tree0292613a5a2ff79109caf4cdc6ea55e9465a1212 /src
parentb6e6d79c7b0d0ed1c3a8660e0fd93dad90d55b71 (diff)
downloadopenbsd-4afcbff6153d561348af47fa000f298df3693a3c.tar.gz
openbsd-4afcbff6153d561348af47fa000f298df3693a3c.tar.bz2
openbsd-4afcbff6153d561348af47fa000f298df3693a3c.zip
cast ASN1_STRING (unsigned char *) to match strlcat's argument (char *)
ok beck@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/ts/ts_rsp_verify.c4
-rw-r--r--src/lib/libssl/src/crypto/ts/ts_rsp_verify.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/ts/ts_rsp_verify.c b/src/lib/libcrypto/ts/ts_rsp_verify.c
index 2c79dd1c8d..2da5a07bce 100644
--- a/src/lib/libcrypto/ts/ts_rsp_verify.c
+++ b/src/lib/libcrypto/ts/ts_rsp_verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts_rsp_verify.c,v 1.9 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: ts_rsp_verify.c,v 1.10 2014/07/09 11:12:13 bcook Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -564,7 +564,7 @@ TS_get_status_text(STACK_OF(ASN1_UTF8STRING) *text)
564 ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i); 564 ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i);
565 if (i > 0) 565 if (i > 0)
566 strlcat(result, "/", length); 566 strlcat(result, "/", length);
567 strlcat(result, ASN1_STRING_data(current), length); 567 strlcat(result, (const char *)ASN1_STRING_data(current), length);
568 } 568 }
569 return result; 569 return result;
570} 570}
diff --git a/src/lib/libssl/src/crypto/ts/ts_rsp_verify.c b/src/lib/libssl/src/crypto/ts/ts_rsp_verify.c
index 2c79dd1c8d..2da5a07bce 100644
--- a/src/lib/libssl/src/crypto/ts/ts_rsp_verify.c
+++ b/src/lib/libssl/src/crypto/ts/ts_rsp_verify.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ts_rsp_verify.c,v 1.9 2014/06/12 15:49:31 deraadt Exp $ */ 1/* $OpenBSD: ts_rsp_verify.c,v 1.10 2014/07/09 11:12:13 bcook Exp $ */
2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL 2/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
3 * project 2002. 3 * project 2002.
4 */ 4 */
@@ -564,7 +564,7 @@ TS_get_status_text(STACK_OF(ASN1_UTF8STRING) *text)
564 ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i); 564 ASN1_UTF8STRING *current = sk_ASN1_UTF8STRING_value(text, i);
565 if (i > 0) 565 if (i > 0)
566 strlcat(result, "/", length); 566 strlcat(result, "/", length);
567 strlcat(result, ASN1_STRING_data(current), length); 567 strlcat(result, (const char *)ASN1_STRING_data(current), length);
568 } 568 }
569 return result; 569 return result;
570} 570}