Changeset dff03fa in mod_gnutls
- Timestamp:
- Sep 18, 2015, 7:45:20 PM (7 years ago)
- Branches:
- asyncio, debian/master, debian/stretch-backports, jessie-backports, master, proxy-ticket, upstream
- Children:
- 34e5dc7
- Parents:
- 9ca1f21
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
configure.ac
r9ca1f21 rdff03fa 16 16 17 17 AC_PROG_CC 18 AC_PROG_CC_C99 18 19 AC_PROG_LD 19 20 AC_PROG_INSTALL -
src/gnutls_hooks.c
r9ca1f21 rdff03fa 220 220 static int read_crt_cn(server_rec * s, apr_pool_t * p, gnutls_x509_crt_t cert, char **cert_cn) { 221 221 222 int rv = 0 , i;222 int rv = 0; 223 223 size_t data_len; 224 224 … … 242 242 rv = 0; 243 243 /* read subject alternative name */ 244 for (i = 0; !(rv < 0); i++) { 244 for (int i = 0; !(rv < 0); i++) 245 { 245 246 data_len = 0; 246 247 rv = gnutls_x509_crt_get_subject_alt_name(cert, i, … … 337 338 else 338 339 { 339 int i; 340 for (i = 0; i < sc_base->p11_modules->nelts; i++) 340 for (int i = 0; i < sc_base->p11_modules->nelts; i++) 341 341 { 342 342 char *p11_module = … … 559 559 int check_server_aliases(vhost_cb_rec *x, server_rec * s, mgs_srvconf_rec *tsc) { 560 560 apr_array_header_t *names; 561 int i,rv = 0;561 int rv = 0; 562 562 char ** name; 563 563 … … 571 571 names = s->names; 572 572 name = (char **)names->elts; 573 for (i = 0; i < names->nelts; ++i) { 573 for (int i = 0; i < names->nelts; ++i) 574 { 574 575 if (!name[i]) { continue; } 575 576 if (apr_strnatcasecmp(x->sni_name, name[i]) == 0) { … … 583 584 names = s->wild_names; 584 585 name = (char **)names->elts; 585 for (i = 0; i < names->nelts; ++i) { 586 for (int i = 0; i < names->nelts; ++i) 587 { 586 588 if (!name[i]) { continue; } 587 589 if(apr_fnmatch(name[i], x->sni_name , … … 1034 1036 char *tmp2; 1035 1037 size_t len; 1036 int ret , i;1038 int ret; 1037 1039 1038 1040 if (r == NULL) … … 1109 1111 1110 1112 /* export all the alternative names (DNS, RFC822 and URI) */ 1111 for (i = 0; !(ret < 0); i++) { 1113 for (int i = 0; !(ret < 0); i++) 1114 { 1112 1115 const char *san, *sanlabel; 1113 1116 len = 0; … … 1474 1477 1475 1478 exit: 1476 if (gnutls_certificate_type_get(ctxt->session) == GNUTLS_CRT_X509) { 1477 unsigned int i; 1478 for (i = 0; i < ch_size; i++) { 1479 if (gnutls_certificate_type_get(ctxt->session) == GNUTLS_CRT_X509) 1480 for (unsigned int i = 0; i < ch_size; i++) 1479 1481 gnutls_x509_crt_deinit(cert.x509[i]); 1480 } 1481 } else if (gnutls_certificate_type_get(ctxt->session) == 1482 GNUTLS_CRT_OPENPGP) 1482 else if (gnutls_certificate_type_get(ctxt->session) == 1483 GNUTLS_CRT_OPENPGP) 1483 1484 gnutls_openpgp_crt_deinit(cert.pgp); 1484 1485 return ret; 1485 1486 1487 } 1486 } 1487 1488 1488 1489 1489 1490 #ifdef ENABLE_MSVA
Note: See TracChangeset
for help on using the changeset viewer.