diff options
| author | Geoff Thorpe <geoff@openssl.org> | 2008-03-16 21:05:46 +0000 |
|---|---|---|
| committer | Geoff Thorpe <geoff@openssl.org> | 2008-03-16 21:05:46 +0000 |
| commit | 1e26a8baedbc74036ada80deb16296e7d4eedb18 (patch) | |
| tree | 180306f9b8f5bf8b17e166d32b4360ca9a7ec631 /ssl/t1_lib.c | |
| parent | 7c337e00d23ac421ff1949ac1bbce2e8b718299e (diff) | |
| download | openssl-new-1e26a8baedbc74036ada80deb16296e7d4eedb18.tar.gz | |
Fix a variety of warnings generated by some elevated compiler-fascism,
OPENSSL_NO_DEPRECATED, etc. Steve, please double-check the CMS stuff...
Diffstat (limited to 'ssl/t1_lib.c')
| -rw-r--r-- | ssl/t1_lib.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 615a1c4f54..170b45d336 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -196,7 +196,9 @@ static int nid_list[] = int tls1_ec_curve_id2nid(int curve_id) { /* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */ - if ((curve_id < 1) || (curve_id > sizeof(nid_list)/sizeof(nid_list[0]))) return 0; + if ((curve_id < 1) || ((unsigned int)curve_id > + sizeof(nid_list)/sizeof(nid_list[0]))) + return 0; return nid_list[curve_id-1]; } @@ -1058,7 +1060,8 @@ int ssl_prepare_clienthello_tlsext(SSL *s) SSLerr(SSL_F_SSL_PREPARE_CLIENTHELLO_TLSEXT,ERR_R_MALLOC_FAILURE); return -1; } - for (i = 1, j = s->tlsext_ellipticcurvelist; i <= sizeof(nid_list)/sizeof(nid_list[0]); i++) + for (i = 1, j = s->tlsext_ellipticcurvelist; (unsigned int)i <= + sizeof(nid_list)/sizeof(nid_list[0]); i++) s2n(i,j); } #endif /* OPENSSL_NO_EC */ |