diff options
Diffstat (limited to 'src/lib/libssl/ssl.h')
| -rw-r--r-- | src/lib/libssl/ssl.h | 57 |
1 files changed, 31 insertions, 26 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 99e188086b..3161f532cf 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
| @@ -467,7 +467,7 @@ typedef struct ssl_session_st | |||
| 467 | #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L | 467 | #define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x00000008L |
| 468 | #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L | 468 | #define SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG 0x00000010L |
| 469 | #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L | 469 | #define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020L |
| 470 | #define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L /* no effect since 0.9.7h and 0.9.8b */ | 470 | #define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x00000040L |
| 471 | #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L | 471 | #define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080L |
| 472 | #define SSL_OP_TLS_D5_BUG 0x00000100L | 472 | #define SSL_OP_TLS_D5_BUG 0x00000100L |
| 473 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L | 473 | #define SSL_OP_TLS_BLOCK_PADDING_BUG 0x00000200L |
| @@ -1567,7 +1567,6 @@ void ERR_load_SSL_strings(void); | |||
| 1567 | #define SSL_F_SSL_CTRL 232 | 1567 | #define SSL_F_SSL_CTRL 232 |
| 1568 | #define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY 168 | 1568 | #define SSL_F_SSL_CTX_CHECK_PRIVATE_KEY 168 |
| 1569 | #define SSL_F_SSL_CTX_NEW 169 | 1569 | #define SSL_F_SSL_CTX_NEW 169 |
| 1570 | #define SSL_F_SSL_CTX_SET_CIPHER_LIST 269 | ||
| 1571 | #define SSL_F_SSL_CTX_SET_PURPOSE 226 | 1570 | #define SSL_F_SSL_CTX_SET_PURPOSE 226 |
| 1572 | #define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT 219 | 1571 | #define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT 219 |
| 1573 | #define SSL_F_SSL_CTX_SET_SSL_VERSION 170 | 1572 | #define SSL_F_SSL_CTX_SET_SSL_VERSION 170 |
| @@ -1597,7 +1596,6 @@ void ERR_load_SSL_strings(void); | |||
| 1597 | #define SSL_F_SSL_SESSION_PRINT_FP 190 | 1596 | #define SSL_F_SSL_SESSION_PRINT_FP 190 |
| 1598 | #define SSL_F_SSL_SESS_CERT_NEW 225 | 1597 | #define SSL_F_SSL_SESS_CERT_NEW 225 |
| 1599 | #define SSL_F_SSL_SET_CERT 191 | 1598 | #define SSL_F_SSL_SET_CERT 191 |
| 1600 | #define SSL_F_SSL_SET_CIPHER_LIST 271 | ||
| 1601 | #define SSL_F_SSL_SET_FD 192 | 1599 | #define SSL_F_SSL_SET_FD 192 |
| 1602 | #define SSL_F_SSL_SET_PKEY 193 | 1600 | #define SSL_F_SSL_SET_PKEY 193 |
| 1603 | #define SSL_F_SSL_SET_PURPOSE 227 | 1601 | #define SSL_F_SSL_SET_PURPOSE 227 |
| @@ -1676,39 +1674,40 @@ void ERR_load_SSL_strings(void); | |||
| 1676 | #define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED 145 | 1674 | #define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED 145 |
| 1677 | #define SSL_R_DATA_LENGTH_TOO_LONG 146 | 1675 | #define SSL_R_DATA_LENGTH_TOO_LONG 146 |
| 1678 | #define SSL_R_DECRYPTION_FAILED 147 | 1676 | #define SSL_R_DECRYPTION_FAILED 147 |
| 1679 | #define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC 281 | 1677 | #define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC 1109 |
| 1680 | #define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG 148 | 1678 | #define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG 148 |
| 1681 | #define SSL_R_DIGEST_CHECK_FAILED 149 | 1679 | #define SSL_R_DIGEST_CHECK_FAILED 149 |
| 1682 | #define SSL_R_ENCRYPTED_LENGTH_TOO_LONG 150 | 1680 | #define SSL_R_ENCRYPTED_LENGTH_TOO_LONG 150 |
| 1683 | #define SSL_R_ERROR_GENERATING_TMP_RSA_KEY 282 | 1681 | #define SSL_R_ERROR_GENERATING_TMP_RSA_KEY 1092 |
| 1684 | #define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST 151 | 1682 | #define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST 151 |
| 1685 | #define SSL_R_EXCESSIVE_MESSAGE_SIZE 152 | 1683 | #define SSL_R_EXCESSIVE_MESSAGE_SIZE 152 |
| 1686 | #define SSL_R_EXTRA_DATA_IN_MESSAGE 153 | 1684 | #define SSL_R_EXTRA_DATA_IN_MESSAGE 153 |
| 1687 | #define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154 | 1685 | #define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154 |
| 1688 | #define SSL_R_HTTPS_PROXY_REQUEST 155 | 1686 | #define SSL_R_HTTPS_PROXY_REQUEST 155 |
| 1689 | #define SSL_R_HTTP_REQUEST 156 | 1687 | #define SSL_R_HTTP_REQUEST 156 |
| 1690 | #define SSL_R_ILLEGAL_PADDING 283 | 1688 | #define SSL_R_ILLEGAL_PADDING 1110 |
| 1691 | #define SSL_R_INVALID_CHALLENGE_LENGTH 158 | 1689 | #define SSL_R_INVALID_CHALLENGE_LENGTH 158 |
| 1692 | #define SSL_R_INVALID_COMMAND 280 | 1690 | #define SSL_R_INVALID_COMMAND 280 |
| 1693 | #define SSL_R_INVALID_PURPOSE 278 | 1691 | #define SSL_R_INVALID_PURPOSE 278 |
| 1694 | #define SSL_R_INVALID_TRUST 279 | 1692 | #define SSL_R_INVALID_TRUST 279 |
| 1695 | #define SSL_R_KEY_ARG_TOO_LONG 284 | 1693 | #define SSL_R_KEY_ARG_TOO_LONG 1112 |
| 1696 | #define SSL_R_KRB5 285 | 1694 | #define SSL_R_KRB5 1104 |
| 1697 | #define SSL_R_KRB5_C_CC_PRINC 286 | 1695 | #define SSL_R_KRB5_C_CC_PRINC 1094 |
| 1698 | #define SSL_R_KRB5_C_GET_CRED 287 | 1696 | #define SSL_R_KRB5_C_GET_CRED 1095 |
| 1699 | #define SSL_R_KRB5_C_INIT 288 | 1697 | #define SSL_R_KRB5_C_INIT 1096 |
| 1700 | #define SSL_R_KRB5_C_MK_REQ 289 | 1698 | #define SSL_R_KRB5_C_MK_REQ 1097 |
| 1701 | #define SSL_R_KRB5_S_BAD_TICKET 290 | 1699 | #define SSL_R_KRB5_S_BAD_TICKET 1098 |
| 1702 | #define SSL_R_KRB5_S_INIT 291 | 1700 | #define SSL_R_KRB5_S_INIT 1099 |
| 1703 | #define SSL_R_KRB5_S_RD_REQ 292 | 1701 | #define SSL_R_KRB5_S_RD_REQ 1108 |
| 1704 | #define SSL_R_KRB5_S_TKT_EXPIRED 293 | 1702 | #define SSL_R_KRB5_S_TKT_EXPIRED 1105 |
| 1705 | #define SSL_R_KRB5_S_TKT_NYV 294 | 1703 | #define SSL_R_KRB5_S_TKT_NYV 1106 |
| 1706 | #define SSL_R_KRB5_S_TKT_SKEW 295 | 1704 | #define SSL_R_KRB5_S_TKT_SKEW 1107 |
| 1707 | #define SSL_R_LENGTH_MISMATCH 159 | 1705 | #define SSL_R_LENGTH_MISMATCH 159 |
| 1708 | #define SSL_R_LENGTH_TOO_SHORT 160 | 1706 | #define SSL_R_LENGTH_TOO_SHORT 160 |
| 1709 | #define SSL_R_LIBRARY_BUG 274 | 1707 | #define SSL_R_LIBRARY_BUG 274 |
| 1710 | #define SSL_R_LIBRARY_HAS_NO_CIPHERS 161 | 1708 | #define SSL_R_LIBRARY_HAS_NO_CIPHERS 161 |
| 1711 | #define SSL_R_MESSAGE_TOO_LONG 296 | 1709 | #define SSL_R_MASTER_KEY_TOO_LONG 1112 |
| 1710 | #define SSL_R_MESSAGE_TOO_LONG 1111 | ||
| 1712 | #define SSL_R_MISSING_DH_DSA_CERT 162 | 1711 | #define SSL_R_MISSING_DH_DSA_CERT 162 |
| 1713 | #define SSL_R_MISSING_DH_KEY 163 | 1712 | #define SSL_R_MISSING_DH_KEY 163 |
| 1714 | #define SSL_R_MISSING_DH_RSA_CERT 164 | 1713 | #define SSL_R_MISSING_DH_RSA_CERT 164 |
| @@ -1745,7 +1744,7 @@ void ERR_load_SSL_strings(void); | |||
| 1745 | #define SSL_R_NULL_SSL_CTX 195 | 1744 | #define SSL_R_NULL_SSL_CTX 195 |
| 1746 | #define SSL_R_NULL_SSL_METHOD_PASSED 196 | 1745 | #define SSL_R_NULL_SSL_METHOD_PASSED 196 |
| 1747 | #define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED 197 | 1746 | #define SSL_R_OLD_SESSION_CIPHER_NOT_RETURNED 197 |
| 1748 | #define SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE 297 | 1747 | #define SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE 1115 |
| 1749 | #define SSL_R_PACKET_LENGTH_TOO_LONG 198 | 1748 | #define SSL_R_PACKET_LENGTH_TOO_LONG 198 |
| 1750 | #define SSL_R_PATH_TOO_LONG 270 | 1749 | #define SSL_R_PATH_TOO_LONG 270 |
| 1751 | #define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE 199 | 1750 | #define SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE 199 |
| @@ -1764,7 +1763,7 @@ void ERR_load_SSL_strings(void); | |||
| 1764 | #define SSL_R_READ_WRONG_PACKET_TYPE 212 | 1763 | #define SSL_R_READ_WRONG_PACKET_TYPE 212 |
| 1765 | #define SSL_R_RECORD_LENGTH_MISMATCH 213 | 1764 | #define SSL_R_RECORD_LENGTH_MISMATCH 213 |
| 1766 | #define SSL_R_RECORD_TOO_LARGE 214 | 1765 | #define SSL_R_RECORD_TOO_LARGE 214 |
| 1767 | #define SSL_R_RECORD_TOO_SMALL 298 | 1766 | #define SSL_R_RECORD_TOO_SMALL 1093 |
| 1768 | #define SSL_R_REQUIRED_CIPHER_MISSING 215 | 1767 | #define SSL_R_REQUIRED_CIPHER_MISSING 215 |
| 1769 | #define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO 216 | 1768 | #define SSL_R_REUSE_CERT_LENGTH_NOT_ZERO 216 |
| 1770 | #define SSL_R_REUSE_CERT_TYPE_NOT_ZERO 217 | 1769 | #define SSL_R_REUSE_CERT_TYPE_NOT_ZERO 217 |
| @@ -1773,8 +1772,8 @@ void ERR_load_SSL_strings(void); | |||
| 1773 | #define SSL_R_SHORT_READ 219 | 1772 | #define SSL_R_SHORT_READ 219 |
| 1774 | #define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE 220 | 1773 | #define SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE 220 |
| 1775 | #define SSL_R_SSL23_DOING_SESSION_ID_REUSE 221 | 1774 | #define SSL_R_SSL23_DOING_SESSION_ID_REUSE 221 |
| 1776 | #define SSL_R_SSL2_CONNECTION_ID_TOO_LONG 299 | 1775 | #define SSL_R_SSL2_CONNECTION_ID_TOO_LONG 1114 |
| 1777 | #define SSL_R_SSL3_SESSION_ID_TOO_LONG 300 | 1776 | #define SSL_R_SSL3_SESSION_ID_TOO_LONG 1113 |
| 1778 | #define SSL_R_SSL3_SESSION_ID_TOO_SHORT 222 | 1777 | #define SSL_R_SSL3_SESSION_ID_TOO_SHORT 222 |
| 1779 | #define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE 1042 | 1778 | #define SSL_R_SSLV3_ALERT_BAD_CERTIFICATE 1042 |
| 1780 | #define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC 1020 | 1779 | #define SSL_R_SSLV3_ALERT_BAD_RECORD_MAC 1020 |
| @@ -1785,15 +1784,20 @@ void ERR_load_SSL_strings(void); | |||
| 1785 | #define SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE 1040 | 1784 | #define SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE 1040 |
| 1786 | #define SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER 1047 | 1785 | #define SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER 1047 |
| 1787 | #define SSL_R_SSLV3_ALERT_NO_CERTIFICATE 1041 | 1786 | #define SSL_R_SSLV3_ALERT_NO_CERTIFICATE 1041 |
| 1787 | #define SSL_R_SSLV3_ALERT_PEER_ERROR_CERTIFICATE 223 | ||
| 1788 | #define SSL_R_SSLV3_ALERT_PEER_ERROR_NO_CERTIFICATE 224 | ||
| 1789 | #define SSL_R_SSLV3_ALERT_PEER_ERROR_NO_CIPHER 225 | ||
| 1790 | #define SSL_R_SSLV3_ALERT_PEER_ERROR_UNSUPPORTED_CERTIFICATE_TYPE 226 | ||
| 1788 | #define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE 1010 | 1791 | #define SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE 1010 |
| 1792 | #define SSL_R_SSLV3_ALERT_UNKNOWN_REMOTE_ERROR_TYPE 227 | ||
| 1789 | #define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE 1043 | 1793 | #define SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE 1043 |
| 1790 | #define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION 228 | 1794 | #define SSL_R_SSL_CTX_HAS_NO_DEFAULT_SSL_VERSION 228 |
| 1791 | #define SSL_R_SSL_HANDSHAKE_FAILURE 229 | 1795 | #define SSL_R_SSL_HANDSHAKE_FAILURE 229 |
| 1792 | #define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS 230 | 1796 | #define SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS 230 |
| 1793 | #define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED 301 | 1797 | #define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED 1102 |
| 1794 | #define SSL_R_SSL_SESSION_ID_CONFLICT 302 | 1798 | #define SSL_R_SSL_SESSION_ID_CONFLICT 1103 |
| 1795 | #define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG 273 | 1799 | #define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG 273 |
| 1796 | #define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH 303 | 1800 | #define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH 1101 |
| 1797 | #define SSL_R_SSL_SESSION_ID_IS_DIFFERENT 231 | 1801 | #define SSL_R_SSL_SESSION_ID_IS_DIFFERENT 231 |
| 1798 | #define SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049 | 1802 | #define SSL_R_TLSV1_ALERT_ACCESS_DENIED 1049 |
| 1799 | #define SSL_R_TLSV1_ALERT_DECODE_ERROR 1050 | 1803 | #define SSL_R_TLSV1_ALERT_DECODE_ERROR 1050 |
| @@ -1834,6 +1838,7 @@ void ERR_load_SSL_strings(void); | |||
| 1834 | #define SSL_R_UNKNOWN_STATE 255 | 1838 | #define SSL_R_UNKNOWN_STATE 255 |
| 1835 | #define SSL_R_UNSUPPORTED_CIPHER 256 | 1839 | #define SSL_R_UNSUPPORTED_CIPHER 256 |
| 1836 | #define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257 | 1840 | #define SSL_R_UNSUPPORTED_COMPRESSION_ALGORITHM 257 |
| 1841 | #define SSL_R_UNSUPPORTED_OPTION 1091 | ||
| 1837 | #define SSL_R_UNSUPPORTED_PROTOCOL 258 | 1842 | #define SSL_R_UNSUPPORTED_PROTOCOL 258 |
| 1838 | #define SSL_R_UNSUPPORTED_SSL_VERSION 259 | 1843 | #define SSL_R_UNSUPPORTED_SSL_VERSION 259 |
| 1839 | #define SSL_R_WRITE_BIO_NOT_SET 260 | 1844 | #define SSL_R_WRITE_BIO_NOT_SET 260 |