Deleted
Added
nxt_openssl.c (1975:6a47cab8f271) | nxt_openssl.c (2077:624e51cfe97a) |
---|---|
1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) NGINX, Inc. 5 */ 6 7#include <nxt_main.h> 8#include <nxt_conf.h> --- 630 unchanged lines hidden (view full) --- 639 if (nxt_conf_type(tickets_conf) == NXT_CONF_BOOLEAN) { 640 if (nxt_conf_get_boolean(tickets_conf) == 0) { 641 goto no_ticket; 642 } 643 644 return NXT_OK; 645 } 646 | 1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) NGINX, Inc. 5 */ 6 7#include <nxt_main.h> 8#include <nxt_conf.h> --- 630 unchanged lines hidden (view full) --- 639 if (nxt_conf_type(tickets_conf) == NXT_CONF_BOOLEAN) { 640 if (nxt_conf_get_boolean(tickets_conf) == 0) { 641 goto no_ticket; 642 } 643 644 return NXT_OK; 645 } 646 |
647 if (nxt_conf_type(tickets_conf) == NXT_CONF_ARRAY) { 648 count = nxt_conf_array_elements_count(tickets_conf); | 647 count = nxt_conf_array_elements_count_or_1(tickets_conf); |
649 | 648 |
650 if (count == 0) { 651 goto no_ticket; 652 } 653 654 } else { 655 /* nxt_conf_type(tickets_conf) == NXT_CONF_STRING */ 656 count = 1; | 649 if (count == 0) { 650 goto no_ticket; |
657 } 658 659#ifdef SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB 660 661 tickets = nxt_mp_get(mp, sizeof(nxt_tls_tickets_t) 662 + count * sizeof(nxt_tls_ticket_t)); 663 if (nxt_slow_path(tickets == NULL)) { 664 return NXT_ERROR; 665 } 666 667 tickets->count = count; 668 tls_init->conf->tickets = tickets; 669 i = 0; 670 671 do { 672 ticket = &tickets->tickets[i]; 673 674 i++; 675 | 651 } 652 653#ifdef SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB 654 655 tickets = nxt_mp_get(mp, sizeof(nxt_tls_tickets_t) 656 + count * sizeof(nxt_tls_ticket_t)); 657 if (nxt_slow_path(tickets == NULL)) { 658 return NXT_ERROR; 659 } 660 661 tickets->count = count; 662 tls_init->conf->tickets = tickets; 663 i = 0; 664 665 do { 666 ticket = &tickets->tickets[i]; 667 668 i++; 669 |
676 if (nxt_conf_type(tickets_conf) == NXT_CONF_ARRAY) { 677 member = nxt_conf_get_array_element(tickets_conf, count - i); 678 if (member == NULL) { 679 break; 680 } 681 682 } else { 683 /* nxt_conf_type(tickets_conf) == NXT_CONF_STRING */ 684 member = tickets_conf; | 670 member = nxt_conf_get_array_element_or_itself(tickets_conf, count - i); 671 if (member == NULL) { 672 break; |
685 } 686 687 nxt_conf_get_string(member, &value); 688 689 len = nxt_base64_decode(buf, value.start, value.length); 690 691 nxt_memcpy(ticket->name, buf, 16); 692 --- 1125 unchanged lines hidden --- | 673 } 674 675 nxt_conf_get_string(member, &value); 676 677 len = nxt_base64_decode(buf, value.start, value.length); 678 679 nxt_memcpy(ticket->name, buf, 16); 680 --- 1125 unchanged lines hidden --- |