Deleted Added
full compact
ssl.h (76866) ssl.h (89837)
1/* ssl/ssl.h */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 569 unchanged lines hidden (view full) ---

578 * is called for the first time, so that "state" and
579 * "handshake_func" are properly initialized. But as
580 * handshake_func is == 0 until then, we use this
581 * test instead of an "init" member.
582 */
583
584 int server; /* are we the server side? - mostly used by SSL_clear*/
585
1/* ssl/ssl.h */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 569 unchanged lines hidden (view full) ---

578 * is called for the first time, so that "state" and
579 * "handshake_func" are properly initialized. But as
580 * handshake_func is == 0 until then, we use this
581 * test instead of an "init" member.
582 */
583
584 int server; /* are we the server side? - mostly used by SSL_clear*/
585
586 int new_session;/* 1 if we are to use a new session */
586 int new_session;/* 1 if we are to use a new session.
587 * NB: For servers, the 'new' session may actually be a previously
588 * cached session or even the previous session */
587 int quiet_shutdown;/* don't send shutdown packets */
588 int shutdown; /* we have shut things down, 0x01 sent, 0x02
589 * for received */
590 int state; /* where we are */
591 int rstate; /* where we are when reading */
592
593 BUF_MEM *init_buf; /* buffer used during init */
594 int init_num; /* amount read/written */

--- 339 unchanged lines hidden (view full) ---

934void SSL_CTX_flush_sessions(SSL_CTX *ctx,long tm);
935
936SSL_CIPHER *SSL_get_current_cipher(SSL *s);
937int SSL_CIPHER_get_bits(SSL_CIPHER *c,int *alg_bits);
938char * SSL_CIPHER_get_version(SSL_CIPHER *c);
939const char * SSL_CIPHER_get_name(SSL_CIPHER *c);
940
941int SSL_get_fd(SSL *s);
589 int quiet_shutdown;/* don't send shutdown packets */
590 int shutdown; /* we have shut things down, 0x01 sent, 0x02
591 * for received */
592 int state; /* where we are */
593 int rstate; /* where we are when reading */
594
595 BUF_MEM *init_buf; /* buffer used during init */
596 int init_num; /* amount read/written */

--- 339 unchanged lines hidden (view full) ---

936void SSL_CTX_flush_sessions(SSL_CTX *ctx,long tm);
937
938SSL_CIPHER *SSL_get_current_cipher(SSL *s);
939int SSL_CIPHER_get_bits(SSL_CIPHER *c,int *alg_bits);
940char * SSL_CIPHER_get_version(SSL_CIPHER *c);
941const char * SSL_CIPHER_get_name(SSL_CIPHER *c);
942
943int SSL_get_fd(SSL *s);
944int SSL_get_rfd(SSL *s);
945int SSL_get_wfd(SSL *s);
942const char * SSL_get_cipher_list(SSL *s,int n);
943char * SSL_get_shared_ciphers(SSL *s, char *buf, int len);
944int SSL_get_read_ahead(SSL * s);
945int SSL_pending(SSL *s);
946#ifndef NO_SOCK
947int SSL_set_fd(SSL *s, int fd);
948int SSL_set_rfd(SSL *s, int fd);
949int SSL_set_wfd(SSL *s, int fd);

--- 30 unchanged lines hidden (view full) ---

980int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */
981STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
982int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
983 const char *file);
984int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
985 const char *dir);
986#endif
987
946const char * SSL_get_cipher_list(SSL *s,int n);
947char * SSL_get_shared_ciphers(SSL *s, char *buf, int len);
948int SSL_get_read_ahead(SSL * s);
949int SSL_pending(SSL *s);
950#ifndef NO_SOCK
951int SSL_set_fd(SSL *s, int fd);
952int SSL_set_rfd(SSL *s, int fd);
953int SSL_set_wfd(SSL *s, int fd);

--- 30 unchanged lines hidden (view full) ---

984int SSL_CTX_use_certificate_chain_file(SSL_CTX *ctx, const char *file); /* PEM type */
985STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file);
986int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
987 const char *file);
988int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stackCAs,
989 const char *dir);
990#endif
991
988void ERR_load_SSL_strings(void );
989void SSL_load_error_strings(void );
990char * SSL_state_string(SSL *s);
991char * SSL_rstate_string(SSL *s);
992char * SSL_state_string_long(SSL *s);
993char * SSL_rstate_string_long(SSL *s);
994long SSL_SESSION_get_time(SSL_SESSION *s);
995long SSL_SESSION_set_time(SSL_SESSION *s, long t);
996long SSL_SESSION_get_timeout(SSL_SESSION *s);

--- 401 unchanged lines hidden (view full) ---

1398#define SSL_R_COMPRESSED_LENGTH_TOO_LONG 140
1399#define SSL_R_COMPRESSION_FAILURE 141
1400#define SSL_R_COMPRESSION_LIBRARY_ERROR 142
1401#define SSL_R_CONNECTION_ID_IS_DIFFERENT 143
1402#define SSL_R_CONNECTION_TYPE_NOT_SET 144
1403#define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED 145
1404#define SSL_R_DATA_LENGTH_TOO_LONG 146
1405#define SSL_R_DECRYPTION_FAILED 147
992void SSL_load_error_strings(void );
993char * SSL_state_string(SSL *s);
994char * SSL_rstate_string(SSL *s);
995char * SSL_state_string_long(SSL *s);
996char * SSL_rstate_string_long(SSL *s);
997long SSL_SESSION_get_time(SSL_SESSION *s);
998long SSL_SESSION_set_time(SSL_SESSION *s, long t);
999long SSL_SESSION_get_timeout(SSL_SESSION *s);

--- 401 unchanged lines hidden (view full) ---

1401#define SSL_R_COMPRESSED_LENGTH_TOO_LONG 140
1402#define SSL_R_COMPRESSION_FAILURE 141
1403#define SSL_R_COMPRESSION_LIBRARY_ERROR 142
1404#define SSL_R_CONNECTION_ID_IS_DIFFERENT 143
1405#define SSL_R_CONNECTION_TYPE_NOT_SET 144
1406#define SSL_R_DATA_BETWEEN_CCS_AND_FINISHED 145
1407#define SSL_R_DATA_LENGTH_TOO_LONG 146
1408#define SSL_R_DECRYPTION_FAILED 147
1409#define SSL_R_DECRYPTION_FAILED_OR_BAD_RECORD_MAC 1109
1406#define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG 148
1407#define SSL_R_DIGEST_CHECK_FAILED 149
1408#define SSL_R_ENCRYPTED_LENGTH_TOO_LONG 150
1409#define SSL_R_ERROR_GENERATING_TMP_RSA_KEY 1092
1410#define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST 151
1411#define SSL_R_EXCESSIVE_MESSAGE_SIZE 152
1412#define SSL_R_EXTRA_DATA_IN_MESSAGE 153
1413#define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
1414#define SSL_R_HTTPS_PROXY_REQUEST 155
1415#define SSL_R_HTTP_REQUEST 156
1410#define SSL_R_DH_PUBLIC_VALUE_LENGTH_IS_WRONG 148
1411#define SSL_R_DIGEST_CHECK_FAILED 149
1412#define SSL_R_ENCRYPTED_LENGTH_TOO_LONG 150
1413#define SSL_R_ERROR_GENERATING_TMP_RSA_KEY 1092
1414#define SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST 151
1415#define SSL_R_EXCESSIVE_MESSAGE_SIZE 152
1416#define SSL_R_EXTRA_DATA_IN_MESSAGE 153
1417#define SSL_R_GOT_A_FIN_BEFORE_A_CCS 154
1418#define SSL_R_HTTPS_PROXY_REQUEST 155
1419#define SSL_R_HTTP_REQUEST 156
1420#define SSL_R_ILLEGAL_PADDING 1110
1416#define SSL_R_INTERNAL_ERROR 157
1417#define SSL_R_INVALID_CHALLENGE_LENGTH 158
1418#define SSL_R_INVALID_COMMAND 280
1419#define SSL_R_INVALID_PURPOSE 278
1420#define SSL_R_INVALID_TRUST 279
1421#define SSL_R_LENGTH_MISMATCH 159
1422#define SSL_R_LENGTH_TOO_SHORT 160
1423#define SSL_R_LIBRARY_BUG 274
1424#define SSL_R_LIBRARY_HAS_NO_CIPHERS 161
1421#define SSL_R_INTERNAL_ERROR 157
1422#define SSL_R_INVALID_CHALLENGE_LENGTH 158
1423#define SSL_R_INVALID_COMMAND 280
1424#define SSL_R_INVALID_PURPOSE 278
1425#define SSL_R_INVALID_TRUST 279
1426#define SSL_R_LENGTH_MISMATCH 159
1427#define SSL_R_LENGTH_TOO_SHORT 160
1428#define SSL_R_LIBRARY_BUG 274
1429#define SSL_R_LIBRARY_HAS_NO_CIPHERS 161
1430#define SSL_R_MESSAGE_TOO_LONG 1111
1425#define SSL_R_MISSING_DH_DSA_CERT 162
1426#define SSL_R_MISSING_DH_KEY 163
1427#define SSL_R_MISSING_DH_RSA_CERT 164
1428#define SSL_R_MISSING_DSA_SIGNING_CERT 165
1429#define SSL_R_MISSING_EXPORT_TMP_DH_KEY 166
1430#define SSL_R_MISSING_EXPORT_TMP_RSA_KEY 167
1431#define SSL_R_MISSING_RSA_CERTIFICATE 168
1432#define SSL_R_MISSING_RSA_ENCRYPTING_CERT 169

--- 134 unchanged lines hidden ---
1431#define SSL_R_MISSING_DH_DSA_CERT 162
1432#define SSL_R_MISSING_DH_KEY 163
1433#define SSL_R_MISSING_DH_RSA_CERT 164
1434#define SSL_R_MISSING_DSA_SIGNING_CERT 165
1435#define SSL_R_MISSING_EXPORT_TMP_DH_KEY 166
1436#define SSL_R_MISSING_EXPORT_TMP_RSA_KEY 167
1437#define SSL_R_MISSING_RSA_CERTIFICATE 168
1438#define SSL_R_MISSING_RSA_ENCRYPTING_CERT 169

--- 134 unchanged lines hidden ---