diff options
| author | jsing <> | 2014-05-25 12:19:38 +0000 |
|---|---|---|
| committer | jsing <> | 2014-05-25 12:19:38 +0000 |
| commit | 272e873b19ba05dbb966cb20a3fa0ca5533b84e2 (patch) | |
| tree | 0e80ec45169751c595768e03fe90e44dba67e8fa /src | |
| parent | 7b7cf02427def33a12d6a27c01ef7a7e64bc08d3 (diff) | |
| download | openbsd-272e873b19ba05dbb966cb20a3fa0ca5533b84e2.tar.gz openbsd-272e873b19ba05dbb966cb20a3fa0ca5533b84e2.tar.bz2 openbsd-272e873b19ba05dbb966cb20a3fa0ca5533b84e2.zip | |
Whitespace fixes to align define values.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/src/ssl/ssl3.h | 171 | ||||
| -rw-r--r-- | src/lib/libssl/ssl3.h | 171 |
2 files changed, 172 insertions, 170 deletions
diff --git a/src/lib/libssl/src/ssl/ssl3.h b/src/lib/libssl/src/ssl/ssl3.h index 2b25357917..2b041d7e2f 100644 --- a/src/lib/libssl/src/ssl/ssl3.h +++ b/src/lib/libssl/src/ssl/ssl3.h | |||
| @@ -554,106 +554,106 @@ typedef struct ssl3_state_st { | |||
| 554 | /* SSLv3 */ | 554 | /* SSLv3 */ |
| 555 | /*client */ | 555 | /*client */ |
| 556 | /* extra state */ | 556 | /* extra state */ |
| 557 | #define SSL3_ST_CW_FLUSH (0x100|SSL_ST_CONNECT) | 557 | #define SSL3_ST_CW_FLUSH (0x100|SSL_ST_CONNECT) |
| 558 | #ifndef OPENSSL_NO_SCTP | 558 | #ifndef OPENSSL_NO_SCTP |
| 559 | #define DTLS1_SCTP_ST_CW_WRITE_SOCK (0x310|SSL_ST_CONNECT) | 559 | #define DTLS1_SCTP_ST_CW_WRITE_SOCK (0x310|SSL_ST_CONNECT) |
| 560 | #define DTLS1_SCTP_ST_CR_READ_SOCK (0x320|SSL_ST_CONNECT) | 560 | #define DTLS1_SCTP_ST_CR_READ_SOCK (0x320|SSL_ST_CONNECT) |
| 561 | #endif | 561 | #endif |
| 562 | /* write to server */ | 562 | /* write to server */ |
| 563 | #define SSL3_ST_CW_CLNT_HELLO_A (0x110|SSL_ST_CONNECT) | 563 | #define SSL3_ST_CW_CLNT_HELLO_A (0x110|SSL_ST_CONNECT) |
| 564 | #define SSL3_ST_CW_CLNT_HELLO_B (0x111|SSL_ST_CONNECT) | 564 | #define SSL3_ST_CW_CLNT_HELLO_B (0x111|SSL_ST_CONNECT) |
| 565 | /* read from server */ | 565 | /* read from server */ |
| 566 | #define SSL3_ST_CR_SRVR_HELLO_A (0x120|SSL_ST_CONNECT) | 566 | #define SSL3_ST_CR_SRVR_HELLO_A (0x120|SSL_ST_CONNECT) |
| 567 | #define SSL3_ST_CR_SRVR_HELLO_B (0x121|SSL_ST_CONNECT) | 567 | #define SSL3_ST_CR_SRVR_HELLO_B (0x121|SSL_ST_CONNECT) |
| 568 | #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT) | 568 | #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT) |
| 569 | #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT) | 569 | #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT) |
| 570 | #define SSL3_ST_CR_CERT_A (0x130|SSL_ST_CONNECT) | 570 | #define SSL3_ST_CR_CERT_A (0x130|SSL_ST_CONNECT) |
| 571 | #define SSL3_ST_CR_CERT_B (0x131|SSL_ST_CONNECT) | 571 | #define SSL3_ST_CR_CERT_B (0x131|SSL_ST_CONNECT) |
| 572 | #define SSL3_ST_CR_KEY_EXCH_A (0x140|SSL_ST_CONNECT) | 572 | #define SSL3_ST_CR_KEY_EXCH_A (0x140|SSL_ST_CONNECT) |
| 573 | #define SSL3_ST_CR_KEY_EXCH_B (0x141|SSL_ST_CONNECT) | 573 | #define SSL3_ST_CR_KEY_EXCH_B (0x141|SSL_ST_CONNECT) |
| 574 | #define SSL3_ST_CR_CERT_REQ_A (0x150|SSL_ST_CONNECT) | 574 | #define SSL3_ST_CR_CERT_REQ_A (0x150|SSL_ST_CONNECT) |
| 575 | #define SSL3_ST_CR_CERT_REQ_B (0x151|SSL_ST_CONNECT) | 575 | #define SSL3_ST_CR_CERT_REQ_B (0x151|SSL_ST_CONNECT) |
| 576 | #define SSL3_ST_CR_SRVR_DONE_A (0x160|SSL_ST_CONNECT) | 576 | #define SSL3_ST_CR_SRVR_DONE_A (0x160|SSL_ST_CONNECT) |
| 577 | #define SSL3_ST_CR_SRVR_DONE_B (0x161|SSL_ST_CONNECT) | 577 | #define SSL3_ST_CR_SRVR_DONE_B (0x161|SSL_ST_CONNECT) |
| 578 | /* write to server */ | 578 | /* write to server */ |
| 579 | #define SSL3_ST_CW_CERT_A (0x170|SSL_ST_CONNECT) | 579 | #define SSL3_ST_CW_CERT_A (0x170|SSL_ST_CONNECT) |
| 580 | #define SSL3_ST_CW_CERT_B (0x171|SSL_ST_CONNECT) | 580 | #define SSL3_ST_CW_CERT_B (0x171|SSL_ST_CONNECT) |
| 581 | #define SSL3_ST_CW_CERT_C (0x172|SSL_ST_CONNECT) | 581 | #define SSL3_ST_CW_CERT_C (0x172|SSL_ST_CONNECT) |
| 582 | #define SSL3_ST_CW_CERT_D (0x173|SSL_ST_CONNECT) | 582 | #define SSL3_ST_CW_CERT_D (0x173|SSL_ST_CONNECT) |
| 583 | #define SSL3_ST_CW_KEY_EXCH_A (0x180|SSL_ST_CONNECT) | 583 | #define SSL3_ST_CW_KEY_EXCH_A (0x180|SSL_ST_CONNECT) |
| 584 | #define SSL3_ST_CW_KEY_EXCH_B (0x181|SSL_ST_CONNECT) | 584 | #define SSL3_ST_CW_KEY_EXCH_B (0x181|SSL_ST_CONNECT) |
| 585 | #define SSL3_ST_CW_CERT_VRFY_A (0x190|SSL_ST_CONNECT) | 585 | #define SSL3_ST_CW_CERT_VRFY_A (0x190|SSL_ST_CONNECT) |
| 586 | #define SSL3_ST_CW_CERT_VRFY_B (0x191|SSL_ST_CONNECT) | 586 | #define SSL3_ST_CW_CERT_VRFY_B (0x191|SSL_ST_CONNECT) |
| 587 | #define SSL3_ST_CW_CHANGE_A (0x1A0|SSL_ST_CONNECT) | 587 | #define SSL3_ST_CW_CHANGE_A (0x1A0|SSL_ST_CONNECT) |
| 588 | #define SSL3_ST_CW_CHANGE_B (0x1A1|SSL_ST_CONNECT) | 588 | #define SSL3_ST_CW_CHANGE_B (0x1A1|SSL_ST_CONNECT) |
| 589 | #ifndef OPENSSL_NO_NEXTPROTONEG | 589 | #ifndef OPENSSL_NO_NEXTPROTONEG |
| 590 | #define SSL3_ST_CW_NEXT_PROTO_A (0x200|SSL_ST_CONNECT) | 590 | #define SSL3_ST_CW_NEXT_PROTO_A (0x200|SSL_ST_CONNECT) |
| 591 | #define SSL3_ST_CW_NEXT_PROTO_B (0x201|SSL_ST_CONNECT) | 591 | #define SSL3_ST_CW_NEXT_PROTO_B (0x201|SSL_ST_CONNECT) |
| 592 | #endif | 592 | #endif |
| 593 | #define SSL3_ST_CW_FINISHED_A (0x1B0|SSL_ST_CONNECT) | 593 | #define SSL3_ST_CW_FINISHED_A (0x1B0|SSL_ST_CONNECT) |
| 594 | #define SSL3_ST_CW_FINISHED_B (0x1B1|SSL_ST_CONNECT) | 594 | #define SSL3_ST_CW_FINISHED_B (0x1B1|SSL_ST_CONNECT) |
| 595 | /* read from server */ | 595 | /* read from server */ |
| 596 | #define SSL3_ST_CR_CHANGE_A (0x1C0|SSL_ST_CONNECT) | 596 | #define SSL3_ST_CR_CHANGE_A (0x1C0|SSL_ST_CONNECT) |
| 597 | #define SSL3_ST_CR_CHANGE_B (0x1C1|SSL_ST_CONNECT) | 597 | #define SSL3_ST_CR_CHANGE_B (0x1C1|SSL_ST_CONNECT) |
| 598 | #define SSL3_ST_CR_FINISHED_A (0x1D0|SSL_ST_CONNECT) | 598 | #define SSL3_ST_CR_FINISHED_A (0x1D0|SSL_ST_CONNECT) |
| 599 | #define SSL3_ST_CR_FINISHED_B (0x1D1|SSL_ST_CONNECT) | 599 | #define SSL3_ST_CR_FINISHED_B (0x1D1|SSL_ST_CONNECT) |
| 600 | #define SSL3_ST_CR_SESSION_TICKET_A (0x1E0|SSL_ST_CONNECT) | 600 | #define SSL3_ST_CR_SESSION_TICKET_A (0x1E0|SSL_ST_CONNECT) |
| 601 | #define SSL3_ST_CR_SESSION_TICKET_B (0x1E1|SSL_ST_CONNECT) | 601 | #define SSL3_ST_CR_SESSION_TICKET_B (0x1E1|SSL_ST_CONNECT) |
| 602 | #define SSL3_ST_CR_CERT_STATUS_A (0x1F0|SSL_ST_CONNECT) | 602 | #define SSL3_ST_CR_CERT_STATUS_A (0x1F0|SSL_ST_CONNECT) |
| 603 | #define SSL3_ST_CR_CERT_STATUS_B (0x1F1|SSL_ST_CONNECT) | 603 | #define SSL3_ST_CR_CERT_STATUS_B (0x1F1|SSL_ST_CONNECT) |
| 604 | 604 | ||
| 605 | /* server */ | 605 | /* server */ |
| 606 | /* extra state */ | 606 | /* extra state */ |
| 607 | #define SSL3_ST_SW_FLUSH (0x100|SSL_ST_ACCEPT) | 607 | #define SSL3_ST_SW_FLUSH (0x100|SSL_ST_ACCEPT) |
| 608 | #ifndef OPENSSL_NO_SCTP | 608 | #ifndef OPENSSL_NO_SCTP |
| 609 | #define DTLS1_SCTP_ST_SW_WRITE_SOCK (0x310|SSL_ST_ACCEPT) | 609 | #define DTLS1_SCTP_ST_SW_WRITE_SOCK (0x310|SSL_ST_ACCEPT) |
| 610 | #define DTLS1_SCTP_ST_SR_READ_SOCK (0x320|SSL_ST_ACCEPT) | 610 | #define DTLS1_SCTP_ST_SR_READ_SOCK (0x320|SSL_ST_ACCEPT) |
| 611 | #endif | 611 | #endif |
| 612 | /* read from client */ | 612 | /* read from client */ |
| 613 | /* Do not change the number values, they do matter */ | 613 | /* Do not change the number values, they do matter */ |
| 614 | #define SSL3_ST_SR_CLNT_HELLO_A (0x110|SSL_ST_ACCEPT) | 614 | #define SSL3_ST_SR_CLNT_HELLO_A (0x110|SSL_ST_ACCEPT) |
| 615 | #define SSL3_ST_SR_CLNT_HELLO_B (0x111|SSL_ST_ACCEPT) | 615 | #define SSL3_ST_SR_CLNT_HELLO_B (0x111|SSL_ST_ACCEPT) |
| 616 | #define SSL3_ST_SR_CLNT_HELLO_C (0x112|SSL_ST_ACCEPT) | 616 | #define SSL3_ST_SR_CLNT_HELLO_C (0x112|SSL_ST_ACCEPT) |
| 617 | /* write to client */ | 617 | /* write to client */ |
| 618 | #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT) | 618 | #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT) |
| 619 | #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT) | 619 | #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT) |
| 620 | #define SSL3_ST_SW_HELLO_REQ_A (0x120|SSL_ST_ACCEPT) | 620 | #define SSL3_ST_SW_HELLO_REQ_A (0x120|SSL_ST_ACCEPT) |
| 621 | #define SSL3_ST_SW_HELLO_REQ_B (0x121|SSL_ST_ACCEPT) | 621 | #define SSL3_ST_SW_HELLO_REQ_B (0x121|SSL_ST_ACCEPT) |
| 622 | #define SSL3_ST_SW_HELLO_REQ_C (0x122|SSL_ST_ACCEPT) | 622 | #define SSL3_ST_SW_HELLO_REQ_C (0x122|SSL_ST_ACCEPT) |
| 623 | #define SSL3_ST_SW_SRVR_HELLO_A (0x130|SSL_ST_ACCEPT) | 623 | #define SSL3_ST_SW_SRVR_HELLO_A (0x130|SSL_ST_ACCEPT) |
| 624 | #define SSL3_ST_SW_SRVR_HELLO_B (0x131|SSL_ST_ACCEPT) | 624 | #define SSL3_ST_SW_SRVR_HELLO_B (0x131|SSL_ST_ACCEPT) |
| 625 | #define SSL3_ST_SW_CERT_A (0x140|SSL_ST_ACCEPT) | 625 | #define SSL3_ST_SW_CERT_A (0x140|SSL_ST_ACCEPT) |
| 626 | #define SSL3_ST_SW_CERT_B (0x141|SSL_ST_ACCEPT) | 626 | #define SSL3_ST_SW_CERT_B (0x141|SSL_ST_ACCEPT) |
| 627 | #define SSL3_ST_SW_KEY_EXCH_A (0x150|SSL_ST_ACCEPT) | 627 | #define SSL3_ST_SW_KEY_EXCH_A (0x150|SSL_ST_ACCEPT) |
| 628 | #define SSL3_ST_SW_KEY_EXCH_B (0x151|SSL_ST_ACCEPT) | 628 | #define SSL3_ST_SW_KEY_EXCH_B (0x151|SSL_ST_ACCEPT) |
| 629 | #define SSL3_ST_SW_CERT_REQ_A (0x160|SSL_ST_ACCEPT) | 629 | #define SSL3_ST_SW_CERT_REQ_A (0x160|SSL_ST_ACCEPT) |
| 630 | #define SSL3_ST_SW_CERT_REQ_B (0x161|SSL_ST_ACCEPT) | 630 | #define SSL3_ST_SW_CERT_REQ_B (0x161|SSL_ST_ACCEPT) |
| 631 | #define SSL3_ST_SW_SRVR_DONE_A (0x170|SSL_ST_ACCEPT) | 631 | #define SSL3_ST_SW_SRVR_DONE_A (0x170|SSL_ST_ACCEPT) |
| 632 | #define SSL3_ST_SW_SRVR_DONE_B (0x171|SSL_ST_ACCEPT) | 632 | #define SSL3_ST_SW_SRVR_DONE_B (0x171|SSL_ST_ACCEPT) |
| 633 | /* read from client */ | 633 | /* read from client */ |
| 634 | #define SSL3_ST_SR_CERT_A (0x180|SSL_ST_ACCEPT) | 634 | #define SSL3_ST_SR_CERT_A (0x180|SSL_ST_ACCEPT) |
| 635 | #define SSL3_ST_SR_CERT_B (0x181|SSL_ST_ACCEPT) | 635 | #define SSL3_ST_SR_CERT_B (0x181|SSL_ST_ACCEPT) |
| 636 | #define SSL3_ST_SR_KEY_EXCH_A (0x190|SSL_ST_ACCEPT) | 636 | #define SSL3_ST_SR_KEY_EXCH_A (0x190|SSL_ST_ACCEPT) |
| 637 | #define SSL3_ST_SR_KEY_EXCH_B (0x191|SSL_ST_ACCEPT) | 637 | #define SSL3_ST_SR_KEY_EXCH_B (0x191|SSL_ST_ACCEPT) |
| 638 | #define SSL3_ST_SR_CERT_VRFY_A (0x1A0|SSL_ST_ACCEPT) | 638 | #define SSL3_ST_SR_CERT_VRFY_A (0x1A0|SSL_ST_ACCEPT) |
| 639 | #define SSL3_ST_SR_CERT_VRFY_B (0x1A1|SSL_ST_ACCEPT) | 639 | #define SSL3_ST_SR_CERT_VRFY_B (0x1A1|SSL_ST_ACCEPT) |
| 640 | #define SSL3_ST_SR_CHANGE_A (0x1B0|SSL_ST_ACCEPT) | 640 | #define SSL3_ST_SR_CHANGE_A (0x1B0|SSL_ST_ACCEPT) |
| 641 | #define SSL3_ST_SR_CHANGE_B (0x1B1|SSL_ST_ACCEPT) | 641 | #define SSL3_ST_SR_CHANGE_B (0x1B1|SSL_ST_ACCEPT) |
| 642 | #ifndef OPENSSL_NO_NEXTPROTONEG | 642 | #ifndef OPENSSL_NO_NEXTPROTONEG |
| 643 | #define SSL3_ST_SR_NEXT_PROTO_A (0x210|SSL_ST_ACCEPT) | 643 | #define SSL3_ST_SR_NEXT_PROTO_A (0x210|SSL_ST_ACCEPT) |
| 644 | #define SSL3_ST_SR_NEXT_PROTO_B (0x211|SSL_ST_ACCEPT) | 644 | #define SSL3_ST_SR_NEXT_PROTO_B (0x211|SSL_ST_ACCEPT) |
| 645 | #endif | 645 | #endif |
| 646 | #define SSL3_ST_SR_FINISHED_A (0x1C0|SSL_ST_ACCEPT) | 646 | #define SSL3_ST_SR_FINISHED_A (0x1C0|SSL_ST_ACCEPT) |
| 647 | #define SSL3_ST_SR_FINISHED_B (0x1C1|SSL_ST_ACCEPT) | 647 | #define SSL3_ST_SR_FINISHED_B (0x1C1|SSL_ST_ACCEPT) |
| 648 | /* write to client */ | 648 | /* write to client */ |
| 649 | #define SSL3_ST_SW_CHANGE_A (0x1D0|SSL_ST_ACCEPT) | 649 | #define SSL3_ST_SW_CHANGE_A (0x1D0|SSL_ST_ACCEPT) |
| 650 | #define SSL3_ST_SW_CHANGE_B (0x1D1|SSL_ST_ACCEPT) | 650 | #define SSL3_ST_SW_CHANGE_B (0x1D1|SSL_ST_ACCEPT) |
| 651 | #define SSL3_ST_SW_FINISHED_A (0x1E0|SSL_ST_ACCEPT) | 651 | #define SSL3_ST_SW_FINISHED_A (0x1E0|SSL_ST_ACCEPT) |
| 652 | #define SSL3_ST_SW_FINISHED_B (0x1E1|SSL_ST_ACCEPT) | 652 | #define SSL3_ST_SW_FINISHED_B (0x1E1|SSL_ST_ACCEPT) |
| 653 | #define SSL3_ST_SW_SESSION_TICKET_A (0x1F0|SSL_ST_ACCEPT) | 653 | #define SSL3_ST_SW_SESSION_TICKET_A (0x1F0|SSL_ST_ACCEPT) |
| 654 | #define SSL3_ST_SW_SESSION_TICKET_B (0x1F1|SSL_ST_ACCEPT) | 654 | #define SSL3_ST_SW_SESSION_TICKET_B (0x1F1|SSL_ST_ACCEPT) |
| 655 | #define SSL3_ST_SW_CERT_STATUS_A (0x200|SSL_ST_ACCEPT) | 655 | #define SSL3_ST_SW_CERT_STATUS_A (0x200|SSL_ST_ACCEPT) |
| 656 | #define SSL3_ST_SW_CERT_STATUS_B (0x201|SSL_ST_ACCEPT) | 656 | #define SSL3_ST_SW_CERT_STATUS_B (0x201|SSL_ST_ACCEPT) |
| 657 | 657 | ||
| 658 | #define SSL3_MT_HELLO_REQUEST 0 | 658 | #define SSL3_MT_HELLO_REQUEST 0 |
| 659 | #define SSL3_MT_CLIENT_HELLO 1 | 659 | #define SSL3_MT_CLIENT_HELLO 1 |
| @@ -667,11 +667,12 @@ typedef struct ssl3_state_st { | |||
| 667 | #define SSL3_MT_CLIENT_KEY_EXCHANGE 16 | 667 | #define SSL3_MT_CLIENT_KEY_EXCHANGE 16 |
| 668 | #define SSL3_MT_FINISHED 20 | 668 | #define SSL3_MT_FINISHED 20 |
| 669 | #define SSL3_MT_CERTIFICATE_STATUS 22 | 669 | #define SSL3_MT_CERTIFICATE_STATUS 22 |
| 670 | |||
| 670 | #ifndef OPENSSL_NO_NEXTPROTONEG | 671 | #ifndef OPENSSL_NO_NEXTPROTONEG |
| 671 | #define SSL3_MT_NEXT_PROTO 67 | 672 | #define SSL3_MT_NEXT_PROTO 67 |
| 672 | #endif | 673 | #endif |
| 673 | #define DTLS1_MT_HELLO_VERIFY_REQUEST 3 | ||
| 674 | 674 | ||
| 675 | #define DTLS1_MT_HELLO_VERIFY_REQUEST 3 | ||
| 675 | 676 | ||
| 676 | #define SSL3_MT_CCS 1 | 677 | #define SSL3_MT_CCS 1 |
| 677 | 678 | ||
| @@ -680,10 +681,10 @@ typedef struct ssl3_state_st { | |||
| 680 | #define SSL3_CC_WRITE 0x02 | 681 | #define SSL3_CC_WRITE 0x02 |
| 681 | #define SSL3_CC_CLIENT 0x10 | 682 | #define SSL3_CC_CLIENT 0x10 |
| 682 | #define SSL3_CC_SERVER 0x20 | 683 | #define SSL3_CC_SERVER 0x20 |
| 683 | #define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE) | 684 | #define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE) |
| 684 | #define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ) | 685 | #define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ) |
| 685 | #define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ) | 686 | #define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ) |
| 686 | #define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE) | 687 | #define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE) |
| 687 | 688 | ||
| 688 | #ifdef __cplusplus | 689 | #ifdef __cplusplus |
| 689 | } | 690 | } |
diff --git a/src/lib/libssl/ssl3.h b/src/lib/libssl/ssl3.h index 2b25357917..2b041d7e2f 100644 --- a/src/lib/libssl/ssl3.h +++ b/src/lib/libssl/ssl3.h | |||
| @@ -554,106 +554,106 @@ typedef struct ssl3_state_st { | |||
| 554 | /* SSLv3 */ | 554 | /* SSLv3 */ |
| 555 | /*client */ | 555 | /*client */ |
| 556 | /* extra state */ | 556 | /* extra state */ |
| 557 | #define SSL3_ST_CW_FLUSH (0x100|SSL_ST_CONNECT) | 557 | #define SSL3_ST_CW_FLUSH (0x100|SSL_ST_CONNECT) |
| 558 | #ifndef OPENSSL_NO_SCTP | 558 | #ifndef OPENSSL_NO_SCTP |
| 559 | #define DTLS1_SCTP_ST_CW_WRITE_SOCK (0x310|SSL_ST_CONNECT) | 559 | #define DTLS1_SCTP_ST_CW_WRITE_SOCK (0x310|SSL_ST_CONNECT) |
| 560 | #define DTLS1_SCTP_ST_CR_READ_SOCK (0x320|SSL_ST_CONNECT) | 560 | #define DTLS1_SCTP_ST_CR_READ_SOCK (0x320|SSL_ST_CONNECT) |
| 561 | #endif | 561 | #endif |
| 562 | /* write to server */ | 562 | /* write to server */ |
| 563 | #define SSL3_ST_CW_CLNT_HELLO_A (0x110|SSL_ST_CONNECT) | 563 | #define SSL3_ST_CW_CLNT_HELLO_A (0x110|SSL_ST_CONNECT) |
| 564 | #define SSL3_ST_CW_CLNT_HELLO_B (0x111|SSL_ST_CONNECT) | 564 | #define SSL3_ST_CW_CLNT_HELLO_B (0x111|SSL_ST_CONNECT) |
| 565 | /* read from server */ | 565 | /* read from server */ |
| 566 | #define SSL3_ST_CR_SRVR_HELLO_A (0x120|SSL_ST_CONNECT) | 566 | #define SSL3_ST_CR_SRVR_HELLO_A (0x120|SSL_ST_CONNECT) |
| 567 | #define SSL3_ST_CR_SRVR_HELLO_B (0x121|SSL_ST_CONNECT) | 567 | #define SSL3_ST_CR_SRVR_HELLO_B (0x121|SSL_ST_CONNECT) |
| 568 | #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT) | 568 | #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_A (0x126|SSL_ST_CONNECT) |
| 569 | #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT) | 569 | #define DTLS1_ST_CR_HELLO_VERIFY_REQUEST_B (0x127|SSL_ST_CONNECT) |
| 570 | #define SSL3_ST_CR_CERT_A (0x130|SSL_ST_CONNECT) | 570 | #define SSL3_ST_CR_CERT_A (0x130|SSL_ST_CONNECT) |
| 571 | #define SSL3_ST_CR_CERT_B (0x131|SSL_ST_CONNECT) | 571 | #define SSL3_ST_CR_CERT_B (0x131|SSL_ST_CONNECT) |
| 572 | #define SSL3_ST_CR_KEY_EXCH_A (0x140|SSL_ST_CONNECT) | 572 | #define SSL3_ST_CR_KEY_EXCH_A (0x140|SSL_ST_CONNECT) |
| 573 | #define SSL3_ST_CR_KEY_EXCH_B (0x141|SSL_ST_CONNECT) | 573 | #define SSL3_ST_CR_KEY_EXCH_B (0x141|SSL_ST_CONNECT) |
| 574 | #define SSL3_ST_CR_CERT_REQ_A (0x150|SSL_ST_CONNECT) | 574 | #define SSL3_ST_CR_CERT_REQ_A (0x150|SSL_ST_CONNECT) |
| 575 | #define SSL3_ST_CR_CERT_REQ_B (0x151|SSL_ST_CONNECT) | 575 | #define SSL3_ST_CR_CERT_REQ_B (0x151|SSL_ST_CONNECT) |
| 576 | #define SSL3_ST_CR_SRVR_DONE_A (0x160|SSL_ST_CONNECT) | 576 | #define SSL3_ST_CR_SRVR_DONE_A (0x160|SSL_ST_CONNECT) |
| 577 | #define SSL3_ST_CR_SRVR_DONE_B (0x161|SSL_ST_CONNECT) | 577 | #define SSL3_ST_CR_SRVR_DONE_B (0x161|SSL_ST_CONNECT) |
| 578 | /* write to server */ | 578 | /* write to server */ |
| 579 | #define SSL3_ST_CW_CERT_A (0x170|SSL_ST_CONNECT) | 579 | #define SSL3_ST_CW_CERT_A (0x170|SSL_ST_CONNECT) |
| 580 | #define SSL3_ST_CW_CERT_B (0x171|SSL_ST_CONNECT) | 580 | #define SSL3_ST_CW_CERT_B (0x171|SSL_ST_CONNECT) |
| 581 | #define SSL3_ST_CW_CERT_C (0x172|SSL_ST_CONNECT) | 581 | #define SSL3_ST_CW_CERT_C (0x172|SSL_ST_CONNECT) |
| 582 | #define SSL3_ST_CW_CERT_D (0x173|SSL_ST_CONNECT) | 582 | #define SSL3_ST_CW_CERT_D (0x173|SSL_ST_CONNECT) |
| 583 | #define SSL3_ST_CW_KEY_EXCH_A (0x180|SSL_ST_CONNECT) | 583 | #define SSL3_ST_CW_KEY_EXCH_A (0x180|SSL_ST_CONNECT) |
| 584 | #define SSL3_ST_CW_KEY_EXCH_B (0x181|SSL_ST_CONNECT) | 584 | #define SSL3_ST_CW_KEY_EXCH_B (0x181|SSL_ST_CONNECT) |
| 585 | #define SSL3_ST_CW_CERT_VRFY_A (0x190|SSL_ST_CONNECT) | 585 | #define SSL3_ST_CW_CERT_VRFY_A (0x190|SSL_ST_CONNECT) |
| 586 | #define SSL3_ST_CW_CERT_VRFY_B (0x191|SSL_ST_CONNECT) | 586 | #define SSL3_ST_CW_CERT_VRFY_B (0x191|SSL_ST_CONNECT) |
| 587 | #define SSL3_ST_CW_CHANGE_A (0x1A0|SSL_ST_CONNECT) | 587 | #define SSL3_ST_CW_CHANGE_A (0x1A0|SSL_ST_CONNECT) |
| 588 | #define SSL3_ST_CW_CHANGE_B (0x1A1|SSL_ST_CONNECT) | 588 | #define SSL3_ST_CW_CHANGE_B (0x1A1|SSL_ST_CONNECT) |
| 589 | #ifndef OPENSSL_NO_NEXTPROTONEG | 589 | #ifndef OPENSSL_NO_NEXTPROTONEG |
| 590 | #define SSL3_ST_CW_NEXT_PROTO_A (0x200|SSL_ST_CONNECT) | 590 | #define SSL3_ST_CW_NEXT_PROTO_A (0x200|SSL_ST_CONNECT) |
| 591 | #define SSL3_ST_CW_NEXT_PROTO_B (0x201|SSL_ST_CONNECT) | 591 | #define SSL3_ST_CW_NEXT_PROTO_B (0x201|SSL_ST_CONNECT) |
| 592 | #endif | 592 | #endif |
| 593 | #define SSL3_ST_CW_FINISHED_A (0x1B0|SSL_ST_CONNECT) | 593 | #define SSL3_ST_CW_FINISHED_A (0x1B0|SSL_ST_CONNECT) |
| 594 | #define SSL3_ST_CW_FINISHED_B (0x1B1|SSL_ST_CONNECT) | 594 | #define SSL3_ST_CW_FINISHED_B (0x1B1|SSL_ST_CONNECT) |
| 595 | /* read from server */ | 595 | /* read from server */ |
| 596 | #define SSL3_ST_CR_CHANGE_A (0x1C0|SSL_ST_CONNECT) | 596 | #define SSL3_ST_CR_CHANGE_A (0x1C0|SSL_ST_CONNECT) |
| 597 | #define SSL3_ST_CR_CHANGE_B (0x1C1|SSL_ST_CONNECT) | 597 | #define SSL3_ST_CR_CHANGE_B (0x1C1|SSL_ST_CONNECT) |
| 598 | #define SSL3_ST_CR_FINISHED_A (0x1D0|SSL_ST_CONNECT) | 598 | #define SSL3_ST_CR_FINISHED_A (0x1D0|SSL_ST_CONNECT) |
| 599 | #define SSL3_ST_CR_FINISHED_B (0x1D1|SSL_ST_CONNECT) | 599 | #define SSL3_ST_CR_FINISHED_B (0x1D1|SSL_ST_CONNECT) |
| 600 | #define SSL3_ST_CR_SESSION_TICKET_A (0x1E0|SSL_ST_CONNECT) | 600 | #define SSL3_ST_CR_SESSION_TICKET_A (0x1E0|SSL_ST_CONNECT) |
| 601 | #define SSL3_ST_CR_SESSION_TICKET_B (0x1E1|SSL_ST_CONNECT) | 601 | #define SSL3_ST_CR_SESSION_TICKET_B (0x1E1|SSL_ST_CONNECT) |
| 602 | #define SSL3_ST_CR_CERT_STATUS_A (0x1F0|SSL_ST_CONNECT) | 602 | #define SSL3_ST_CR_CERT_STATUS_A (0x1F0|SSL_ST_CONNECT) |
| 603 | #define SSL3_ST_CR_CERT_STATUS_B (0x1F1|SSL_ST_CONNECT) | 603 | #define SSL3_ST_CR_CERT_STATUS_B (0x1F1|SSL_ST_CONNECT) |
| 604 | 604 | ||
| 605 | /* server */ | 605 | /* server */ |
| 606 | /* extra state */ | 606 | /* extra state */ |
| 607 | #define SSL3_ST_SW_FLUSH (0x100|SSL_ST_ACCEPT) | 607 | #define SSL3_ST_SW_FLUSH (0x100|SSL_ST_ACCEPT) |
| 608 | #ifndef OPENSSL_NO_SCTP | 608 | #ifndef OPENSSL_NO_SCTP |
| 609 | #define DTLS1_SCTP_ST_SW_WRITE_SOCK (0x310|SSL_ST_ACCEPT) | 609 | #define DTLS1_SCTP_ST_SW_WRITE_SOCK (0x310|SSL_ST_ACCEPT) |
| 610 | #define DTLS1_SCTP_ST_SR_READ_SOCK (0x320|SSL_ST_ACCEPT) | 610 | #define DTLS1_SCTP_ST_SR_READ_SOCK (0x320|SSL_ST_ACCEPT) |
| 611 | #endif | 611 | #endif |
| 612 | /* read from client */ | 612 | /* read from client */ |
| 613 | /* Do not change the number values, they do matter */ | 613 | /* Do not change the number values, they do matter */ |
| 614 | #define SSL3_ST_SR_CLNT_HELLO_A (0x110|SSL_ST_ACCEPT) | 614 | #define SSL3_ST_SR_CLNT_HELLO_A (0x110|SSL_ST_ACCEPT) |
| 615 | #define SSL3_ST_SR_CLNT_HELLO_B (0x111|SSL_ST_ACCEPT) | 615 | #define SSL3_ST_SR_CLNT_HELLO_B (0x111|SSL_ST_ACCEPT) |
| 616 | #define SSL3_ST_SR_CLNT_HELLO_C (0x112|SSL_ST_ACCEPT) | 616 | #define SSL3_ST_SR_CLNT_HELLO_C (0x112|SSL_ST_ACCEPT) |
| 617 | /* write to client */ | 617 | /* write to client */ |
| 618 | #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT) | 618 | #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_A (0x113|SSL_ST_ACCEPT) |
| 619 | #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT) | 619 | #define DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B (0x114|SSL_ST_ACCEPT) |
| 620 | #define SSL3_ST_SW_HELLO_REQ_A (0x120|SSL_ST_ACCEPT) | 620 | #define SSL3_ST_SW_HELLO_REQ_A (0x120|SSL_ST_ACCEPT) |
| 621 | #define SSL3_ST_SW_HELLO_REQ_B (0x121|SSL_ST_ACCEPT) | 621 | #define SSL3_ST_SW_HELLO_REQ_B (0x121|SSL_ST_ACCEPT) |
| 622 | #define SSL3_ST_SW_HELLO_REQ_C (0x122|SSL_ST_ACCEPT) | 622 | #define SSL3_ST_SW_HELLO_REQ_C (0x122|SSL_ST_ACCEPT) |
| 623 | #define SSL3_ST_SW_SRVR_HELLO_A (0x130|SSL_ST_ACCEPT) | 623 | #define SSL3_ST_SW_SRVR_HELLO_A (0x130|SSL_ST_ACCEPT) |
| 624 | #define SSL3_ST_SW_SRVR_HELLO_B (0x131|SSL_ST_ACCEPT) | 624 | #define SSL3_ST_SW_SRVR_HELLO_B (0x131|SSL_ST_ACCEPT) |
| 625 | #define SSL3_ST_SW_CERT_A (0x140|SSL_ST_ACCEPT) | 625 | #define SSL3_ST_SW_CERT_A (0x140|SSL_ST_ACCEPT) |
| 626 | #define SSL3_ST_SW_CERT_B (0x141|SSL_ST_ACCEPT) | 626 | #define SSL3_ST_SW_CERT_B (0x141|SSL_ST_ACCEPT) |
| 627 | #define SSL3_ST_SW_KEY_EXCH_A (0x150|SSL_ST_ACCEPT) | 627 | #define SSL3_ST_SW_KEY_EXCH_A (0x150|SSL_ST_ACCEPT) |
| 628 | #define SSL3_ST_SW_KEY_EXCH_B (0x151|SSL_ST_ACCEPT) | 628 | #define SSL3_ST_SW_KEY_EXCH_B (0x151|SSL_ST_ACCEPT) |
| 629 | #define SSL3_ST_SW_CERT_REQ_A (0x160|SSL_ST_ACCEPT) | 629 | #define SSL3_ST_SW_CERT_REQ_A (0x160|SSL_ST_ACCEPT) |
| 630 | #define SSL3_ST_SW_CERT_REQ_B (0x161|SSL_ST_ACCEPT) | 630 | #define SSL3_ST_SW_CERT_REQ_B (0x161|SSL_ST_ACCEPT) |
| 631 | #define SSL3_ST_SW_SRVR_DONE_A (0x170|SSL_ST_ACCEPT) | 631 | #define SSL3_ST_SW_SRVR_DONE_A (0x170|SSL_ST_ACCEPT) |
| 632 | #define SSL3_ST_SW_SRVR_DONE_B (0x171|SSL_ST_ACCEPT) | 632 | #define SSL3_ST_SW_SRVR_DONE_B (0x171|SSL_ST_ACCEPT) |
| 633 | /* read from client */ | 633 | /* read from client */ |
| 634 | #define SSL3_ST_SR_CERT_A (0x180|SSL_ST_ACCEPT) | 634 | #define SSL3_ST_SR_CERT_A (0x180|SSL_ST_ACCEPT) |
| 635 | #define SSL3_ST_SR_CERT_B (0x181|SSL_ST_ACCEPT) | 635 | #define SSL3_ST_SR_CERT_B (0x181|SSL_ST_ACCEPT) |
| 636 | #define SSL3_ST_SR_KEY_EXCH_A (0x190|SSL_ST_ACCEPT) | 636 | #define SSL3_ST_SR_KEY_EXCH_A (0x190|SSL_ST_ACCEPT) |
| 637 | #define SSL3_ST_SR_KEY_EXCH_B (0x191|SSL_ST_ACCEPT) | 637 | #define SSL3_ST_SR_KEY_EXCH_B (0x191|SSL_ST_ACCEPT) |
| 638 | #define SSL3_ST_SR_CERT_VRFY_A (0x1A0|SSL_ST_ACCEPT) | 638 | #define SSL3_ST_SR_CERT_VRFY_A (0x1A0|SSL_ST_ACCEPT) |
| 639 | #define SSL3_ST_SR_CERT_VRFY_B (0x1A1|SSL_ST_ACCEPT) | 639 | #define SSL3_ST_SR_CERT_VRFY_B (0x1A1|SSL_ST_ACCEPT) |
| 640 | #define SSL3_ST_SR_CHANGE_A (0x1B0|SSL_ST_ACCEPT) | 640 | #define SSL3_ST_SR_CHANGE_A (0x1B0|SSL_ST_ACCEPT) |
| 641 | #define SSL3_ST_SR_CHANGE_B (0x1B1|SSL_ST_ACCEPT) | 641 | #define SSL3_ST_SR_CHANGE_B (0x1B1|SSL_ST_ACCEPT) |
| 642 | #ifndef OPENSSL_NO_NEXTPROTONEG | 642 | #ifndef OPENSSL_NO_NEXTPROTONEG |
| 643 | #define SSL3_ST_SR_NEXT_PROTO_A (0x210|SSL_ST_ACCEPT) | 643 | #define SSL3_ST_SR_NEXT_PROTO_A (0x210|SSL_ST_ACCEPT) |
| 644 | #define SSL3_ST_SR_NEXT_PROTO_B (0x211|SSL_ST_ACCEPT) | 644 | #define SSL3_ST_SR_NEXT_PROTO_B (0x211|SSL_ST_ACCEPT) |
| 645 | #endif | 645 | #endif |
| 646 | #define SSL3_ST_SR_FINISHED_A (0x1C0|SSL_ST_ACCEPT) | 646 | #define SSL3_ST_SR_FINISHED_A (0x1C0|SSL_ST_ACCEPT) |
| 647 | #define SSL3_ST_SR_FINISHED_B (0x1C1|SSL_ST_ACCEPT) | 647 | #define SSL3_ST_SR_FINISHED_B (0x1C1|SSL_ST_ACCEPT) |
| 648 | /* write to client */ | 648 | /* write to client */ |
| 649 | #define SSL3_ST_SW_CHANGE_A (0x1D0|SSL_ST_ACCEPT) | 649 | #define SSL3_ST_SW_CHANGE_A (0x1D0|SSL_ST_ACCEPT) |
| 650 | #define SSL3_ST_SW_CHANGE_B (0x1D1|SSL_ST_ACCEPT) | 650 | #define SSL3_ST_SW_CHANGE_B (0x1D1|SSL_ST_ACCEPT) |
| 651 | #define SSL3_ST_SW_FINISHED_A (0x1E0|SSL_ST_ACCEPT) | 651 | #define SSL3_ST_SW_FINISHED_A (0x1E0|SSL_ST_ACCEPT) |
| 652 | #define SSL3_ST_SW_FINISHED_B (0x1E1|SSL_ST_ACCEPT) | 652 | #define SSL3_ST_SW_FINISHED_B (0x1E1|SSL_ST_ACCEPT) |
| 653 | #define SSL3_ST_SW_SESSION_TICKET_A (0x1F0|SSL_ST_ACCEPT) | 653 | #define SSL3_ST_SW_SESSION_TICKET_A (0x1F0|SSL_ST_ACCEPT) |
| 654 | #define SSL3_ST_SW_SESSION_TICKET_B (0x1F1|SSL_ST_ACCEPT) | 654 | #define SSL3_ST_SW_SESSION_TICKET_B (0x1F1|SSL_ST_ACCEPT) |
| 655 | #define SSL3_ST_SW_CERT_STATUS_A (0x200|SSL_ST_ACCEPT) | 655 | #define SSL3_ST_SW_CERT_STATUS_A (0x200|SSL_ST_ACCEPT) |
| 656 | #define SSL3_ST_SW_CERT_STATUS_B (0x201|SSL_ST_ACCEPT) | 656 | #define SSL3_ST_SW_CERT_STATUS_B (0x201|SSL_ST_ACCEPT) |
| 657 | 657 | ||
| 658 | #define SSL3_MT_HELLO_REQUEST 0 | 658 | #define SSL3_MT_HELLO_REQUEST 0 |
| 659 | #define SSL3_MT_CLIENT_HELLO 1 | 659 | #define SSL3_MT_CLIENT_HELLO 1 |
| @@ -667,11 +667,12 @@ typedef struct ssl3_state_st { | |||
| 667 | #define SSL3_MT_CLIENT_KEY_EXCHANGE 16 | 667 | #define SSL3_MT_CLIENT_KEY_EXCHANGE 16 |
| 668 | #define SSL3_MT_FINISHED 20 | 668 | #define SSL3_MT_FINISHED 20 |
| 669 | #define SSL3_MT_CERTIFICATE_STATUS 22 | 669 | #define SSL3_MT_CERTIFICATE_STATUS 22 |
| 670 | |||
| 670 | #ifndef OPENSSL_NO_NEXTPROTONEG | 671 | #ifndef OPENSSL_NO_NEXTPROTONEG |
| 671 | #define SSL3_MT_NEXT_PROTO 67 | 672 | #define SSL3_MT_NEXT_PROTO 67 |
| 672 | #endif | 673 | #endif |
| 673 | #define DTLS1_MT_HELLO_VERIFY_REQUEST 3 | ||
| 674 | 674 | ||
| 675 | #define DTLS1_MT_HELLO_VERIFY_REQUEST 3 | ||
| 675 | 676 | ||
| 676 | #define SSL3_MT_CCS 1 | 677 | #define SSL3_MT_CCS 1 |
| 677 | 678 | ||
| @@ -680,10 +681,10 @@ typedef struct ssl3_state_st { | |||
| 680 | #define SSL3_CC_WRITE 0x02 | 681 | #define SSL3_CC_WRITE 0x02 |
| 681 | #define SSL3_CC_CLIENT 0x10 | 682 | #define SSL3_CC_CLIENT 0x10 |
| 682 | #define SSL3_CC_SERVER 0x20 | 683 | #define SSL3_CC_SERVER 0x20 |
| 683 | #define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE) | 684 | #define SSL3_CHANGE_CIPHER_CLIENT_WRITE (SSL3_CC_CLIENT|SSL3_CC_WRITE) |
| 684 | #define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ) | 685 | #define SSL3_CHANGE_CIPHER_SERVER_READ (SSL3_CC_SERVER|SSL3_CC_READ) |
| 685 | #define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ) | 686 | #define SSL3_CHANGE_CIPHER_CLIENT_READ (SSL3_CC_CLIENT|SSL3_CC_READ) |
| 686 | #define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE) | 687 | #define SSL3_CHANGE_CIPHER_SERVER_WRITE (SSL3_CC_SERVER|SSL3_CC_WRITE) |
| 687 | 688 | ||
| 688 | #ifdef __cplusplus | 689 | #ifdef __cplusplus |
| 689 | } | 690 | } |