diff options
author | jsing <> | 2016-12-03 12:34:35 +0000 |
---|---|---|
committer | jsing <> | 2016-12-03 12:34:35 +0000 |
commit | af83ada514fa464f3509c3fea817e54aec9e8ed5 (patch) | |
tree | 8ef275a8ac5312337c385a03eb510a3b70e33eaa /src/lib/libssl/s3_clnt.c | |
parent | 0d9fc4b27df17ee9113ab05bb64756708099eadf (diff) | |
download | openbsd-af83ada514fa464f3509c3fea817e54aec9e8ed5.tar.gz openbsd-af83ada514fa464f3509c3fea817e54aec9e8ed5.tar.bz2 openbsd-af83ada514fa464f3509c3fea817e54aec9e8ed5.zip |
Avoid signed vs unsigned warnings from clang by adding two casts,
slightly rewriting some code and changing the type of an array.
ok bcook@ doug@
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r-- | src/lib/libssl/s3_clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c index 57c11f458a..08b804dcfe 100644 --- a/src/lib/libssl/s3_clnt.c +++ b/src/lib/libssl/s3_clnt.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: s3_clnt.c,v 1.145 2016/11/06 09:44:51 bcook Exp $ */ | 1 | /* $OpenBSD: s3_clnt.c,v 1.146 2016/12/03 12:34:35 jsing 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 | * |
@@ -1574,7 +1574,7 @@ ssl3_get_certificate_request(SSL *s) | |||
1574 | if (ctype_num > SSL3_CT_NUMBER) | 1574 | if (ctype_num > SSL3_CT_NUMBER) |
1575 | ctype_num = SSL3_CT_NUMBER; | 1575 | ctype_num = SSL3_CT_NUMBER; |
1576 | if (!CBS_get_bytes(&cert_request, &ctypes, ctype_num) || | 1576 | if (!CBS_get_bytes(&cert_request, &ctypes, ctype_num) || |
1577 | !CBS_write_bytes(&ctypes, s->s3->tmp.ctype, | 1577 | !CBS_write_bytes(&ctypes, (uint8_t *)s->s3->tmp.ctype, |
1578 | sizeof(s->s3->tmp.ctype), NULL)) { | 1578 | sizeof(s->s3->tmp.ctype), NULL)) { |
1579 | SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, | 1579 | SSLerr(SSL_F_SSL3_GET_CERTIFICATE_REQUEST, |
1580 | SSL_R_DATA_LENGTH_TOO_LONG); | 1580 | SSL_R_DATA_LENGTH_TOO_LONG); |