projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't test heartbeats when there aren't any.
[openssl.git]
/
ssl
/
ssl_locl.h
diff --git
a/ssl/ssl_locl.h
b/ssl/ssl_locl.h
index 7fdb2638e7b4e7b217947d4a7ef3c1f00bfd899b..00136b3d4ec95655b3a620d81d2597de780f9ba1 100644
(file)
--- a/
ssl/ssl_locl.h
+++ b/
ssl/ssl_locl.h
@@
-297,24
+297,20
@@
# define SSL_kDHE 0x00000002U
/* synonym */
# define SSL_kEDH SSL_kDHE
# define SSL_kDHE 0x00000002U
/* synonym */
# define SSL_kEDH SSL_kDHE
-/* ECDH cert, RSA CA cert */
-# define SSL_kECDHr 0x00000004U
-/* ECDH cert, ECDSA CA cert */
-# define SSL_kECDHe 0x00000008U
/* ephemeral ECDH */
/* ephemeral ECDH */
-# define SSL_kECDHE 0x000000
10
U
+# define SSL_kECDHE 0x000000
04
U
/* synonym */
# define SSL_kEECDH SSL_kECDHE
/* PSK */
/* synonym */
# define SSL_kEECDH SSL_kECDHE
/* PSK */
-# define SSL_kPSK 0x000000
20
U
+# define SSL_kPSK 0x000000
08
U
/* GOST key exchange */
/* GOST key exchange */
-# define SSL_kGOST 0x000000
4
0U
+# define SSL_kGOST 0x000000
1
0U
/* SRP */
/* SRP */
-# define SSL_kSRP 0x000000
8
0U
+# define SSL_kSRP 0x000000
2
0U
-# define SSL_kRSAPSK 0x00000
10
0U
-# define SSL_kECDHEPSK 0x00000
20
0U
-# define SSL_kDHEPSK 0x00000
4
00U
+# define SSL_kRSAPSK 0x00000
04
0U
+# define SSL_kECDHEPSK 0x00000
08
0U
+# define SSL_kDHEPSK 0x00000
1
00U
/* all PSK */
/* all PSK */
@@
-327,18
+323,16
@@
# define SSL_aDSS 0x00000002U
/* no auth (i.e. use ADH or AECDH) */
# define SSL_aNULL 0x00000004U
# define SSL_aDSS 0x00000002U
/* no auth (i.e. use ADH or AECDH) */
# define SSL_aNULL 0x00000004U
-/* Fixed ECDH auth (kECDHe or kECDHr) */
-# define SSL_aECDH 0x00000008U
/* ECDSA auth*/
/* ECDSA auth*/
-# define SSL_aECDSA 0x000000
10
U
+# define SSL_aECDSA 0x000000
08
U
/* PSK auth */
/* PSK auth */
-# define SSL_aPSK 0x000000
2
0U
+# define SSL_aPSK 0x000000
1
0U
/* GOST R 34.10-2001 signature auth */
/* GOST R 34.10-2001 signature auth */
-# define SSL_aGOST01 0x000000
4
0U
+# define SSL_aGOST01 0x000000
2
0U
/* SRP auth */
/* SRP auth */
-# define SSL_aSRP 0x000000
8
0U
+# define SSL_aSRP 0x000000
4
0U
/* GOST R 34.10-2012 signature auth */
/* GOST R 34.10-2012 signature auth */
-# define SSL_aGOST12 0x00000
10
0U
+# define SSL_aGOST12 0x00000
08
0U
/* Bits for algorithm_enc (symmetric encryption) */
# define SSL_DES 0x00000001U
/* Bits for algorithm_enc (symmetric encryption) */
# define SSL_DES 0x00000001U
@@
-1171,7
+1165,7
@@
struct ssl_st {
* basis, depending on the chosen cipher.
*/
int (*not_resumable_session_cb) (SSL *ssl, int is_forward_secure);
* basis, depending on the chosen cipher.
*/
int (*not_resumable_session_cb) (SSL *ssl, int is_forward_secure);
-
+
RECORD_LAYER rlayer;
/* Default password callback. */
RECORD_LAYER rlayer;
/* Default password callback. */
@@
-1697,7
+1691,6
@@
typedef struct ssl3_comp_st {
# endif
extern SSL3_ENC_METHOD ssl3_undef_enc_method;
# endif
extern SSL3_ENC_METHOD ssl3_undef_enc_method;
-OPENSSL_EXTERN const SSL_CIPHER ssl3_ciphers[];
SSL_METHOD *ssl_bad_method(int ver);
SSL_METHOD *ssl_bad_method(int ver);
@@
-1833,8
+1826,10
@@
const SSL_METHOD *func_name(void) \
struct openssl_ssl_test_functions {
int (*p_ssl_init_wbio_buffer) (SSL *s, int push);
int (*p_ssl3_setup_buffers) (SSL *s);
struct openssl_ssl_test_functions {
int (*p_ssl_init_wbio_buffer) (SSL *s, int push);
int (*p_ssl3_setup_buffers) (SSL *s);
+# ifndef OPENSSL_NO_HEARTBEATS
int (*p_dtls1_process_heartbeat) (SSL *s,
unsigned char *p, unsigned int length);
int (*p_dtls1_process_heartbeat) (SSL *s,
unsigned char *p, unsigned int length);
+# endif
};
# ifndef OPENSSL_UNIT_TEST
};
# ifndef OPENSSL_UNIT_TEST