diff options
| author | bcook <> | 2014-11-26 05:01:47 +0000 |
|---|---|---|
| committer | bcook <> | 2014-11-26 05:01:47 +0000 |
| commit | 6f652676bf6d92f62e063a7719b1f2d117f9f74b (patch) | |
| tree | 71c6b617d82a5eab4867a3082e96cc4c0ec44b6b /src/lib | |
| parent | 823c0421349b60ea4bc7145d20a9d33c7e551b3e (diff) | |
| download | openbsd-6f652676bf6d92f62e063a7719b1f2d117f9f74b.tar.gz openbsd-6f652676bf6d92f62e063a7719b1f2d117f9f74b.tar.bz2 openbsd-6f652676bf6d92f62e063a7719b1f2d117f9f74b.zip | |
Linux has had IP_MTU since 2005, don't force it.
ok beck@ miod@ tedu@ deraadt@
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/bio/bss_dgram.c | 12 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/bio/bss_dgram.c | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c index 9e8cb9024e..8f7f945e73 100644 --- a/src/lib/libcrypto/bio/bss_dgram.c +++ b/src/lib/libcrypto/bio/bss_dgram.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bss_dgram.c,v 1.33 2014/08/24 16:08:30 bcook Exp $ */ | 1 | /* $OpenBSD: bss_dgram.c,v 1.34 2014/11/26 05:01:47 bcook Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -81,10 +81,6 @@ | |||
| 81 | #define OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE 0xc0 | 81 | #define OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE 0xc0 |
| 82 | #endif | 82 | #endif |
| 83 | 83 | ||
| 84 | #if defined(OPENSSL_SYS_LINUX) && !defined(IP_MTU) | ||
| 85 | #define IP_MTU 14 /* linux is lame */ | ||
| 86 | #endif | ||
| 87 | |||
| 88 | static int dgram_write(BIO *h, const char *buf, int num); | 84 | static int dgram_write(BIO *h, const char *buf, int num); |
| 89 | static int dgram_read(BIO *h, char *buf, int size); | 85 | static int dgram_read(BIO *h, char *buf, int size); |
| 90 | static int dgram_puts(BIO *h, const char *str); | 86 | static int dgram_puts(BIO *h, const char *str); |
| @@ -394,7 +390,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 394 | int *ip; | 390 | int *ip; |
| 395 | struct sockaddr *to = NULL; | 391 | struct sockaddr *to = NULL; |
| 396 | bio_dgram_data *data = NULL; | 392 | bio_dgram_data *data = NULL; |
| 397 | #if defined(OPENSSL_SYS_LINUX) && (defined(IP_MTU_DISCOVER) || defined(IP_MTU)) | 393 | #if (defined(IP_MTU_DISCOVER) || defined(IP_MTU)) |
| 398 | int sockopt_val = 0; | 394 | int sockopt_val = 0; |
| 399 | socklen_t sockopt_len; /* assume that system supporting IP_MTU is | 395 | socklen_t sockopt_len; /* assume that system supporting IP_MTU is |
| 400 | * modern enough to define socklen_t */ | 396 | * modern enough to define socklen_t */ |
| @@ -463,7 +459,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 463 | break; | 459 | break; |
| 464 | /* (Linux)kernel sets DF bit on outgoing IP packets */ | 460 | /* (Linux)kernel sets DF bit on outgoing IP packets */ |
| 465 | case BIO_CTRL_DGRAM_MTU_DISCOVER: | 461 | case BIO_CTRL_DGRAM_MTU_DISCOVER: |
| 466 | #if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) | 462 | #if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) |
| 467 | addr_len = (socklen_t)sizeof(addr); | 463 | addr_len = (socklen_t)sizeof(addr); |
| 468 | memset((void *)&addr, 0, sizeof(addr)); | 464 | memset((void *)&addr, 0, sizeof(addr)); |
| 469 | if (getsockname(b->num, &addr.sa, &addr_len) < 0) { | 465 | if (getsockname(b->num, &addr.sa, &addr_len) < 0) { |
| @@ -496,7 +492,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 496 | break; | 492 | break; |
| 497 | #endif | 493 | #endif |
| 498 | case BIO_CTRL_DGRAM_QUERY_MTU: | 494 | case BIO_CTRL_DGRAM_QUERY_MTU: |
| 499 | #if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU) | 495 | #if defined(IP_MTU) |
| 500 | addr_len = (socklen_t)sizeof(addr); | 496 | addr_len = (socklen_t)sizeof(addr); |
| 501 | memset((void *)&addr, 0, sizeof(addr)); | 497 | memset((void *)&addr, 0, sizeof(addr)); |
| 502 | if (getsockname(b->num, &addr.sa, &addr_len) < 0) { | 498 | if (getsockname(b->num, &addr.sa, &addr_len) < 0) { |
diff --git a/src/lib/libssl/src/crypto/bio/bss_dgram.c b/src/lib/libssl/src/crypto/bio/bss_dgram.c index 9e8cb9024e..8f7f945e73 100644 --- a/src/lib/libssl/src/crypto/bio/bss_dgram.c +++ b/src/lib/libssl/src/crypto/bio/bss_dgram.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bss_dgram.c,v 1.33 2014/08/24 16:08:30 bcook Exp $ */ | 1 | /* $OpenBSD: bss_dgram.c,v 1.34 2014/11/26 05:01:47 bcook Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
| 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
| @@ -81,10 +81,6 @@ | |||
| 81 | #define OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE 0xc0 | 81 | #define OPENSSL_SCTP_FORWARD_CUM_TSN_CHUNK_TYPE 0xc0 |
| 82 | #endif | 82 | #endif |
| 83 | 83 | ||
| 84 | #if defined(OPENSSL_SYS_LINUX) && !defined(IP_MTU) | ||
| 85 | #define IP_MTU 14 /* linux is lame */ | ||
| 86 | #endif | ||
| 87 | |||
| 88 | static int dgram_write(BIO *h, const char *buf, int num); | 84 | static int dgram_write(BIO *h, const char *buf, int num); |
| 89 | static int dgram_read(BIO *h, char *buf, int size); | 85 | static int dgram_read(BIO *h, char *buf, int size); |
| 90 | static int dgram_puts(BIO *h, const char *str); | 86 | static int dgram_puts(BIO *h, const char *str); |
| @@ -394,7 +390,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 394 | int *ip; | 390 | int *ip; |
| 395 | struct sockaddr *to = NULL; | 391 | struct sockaddr *to = NULL; |
| 396 | bio_dgram_data *data = NULL; | 392 | bio_dgram_data *data = NULL; |
| 397 | #if defined(OPENSSL_SYS_LINUX) && (defined(IP_MTU_DISCOVER) || defined(IP_MTU)) | 393 | #if (defined(IP_MTU_DISCOVER) || defined(IP_MTU)) |
| 398 | int sockopt_val = 0; | 394 | int sockopt_val = 0; |
| 399 | socklen_t sockopt_len; /* assume that system supporting IP_MTU is | 395 | socklen_t sockopt_len; /* assume that system supporting IP_MTU is |
| 400 | * modern enough to define socklen_t */ | 396 | * modern enough to define socklen_t */ |
| @@ -463,7 +459,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 463 | break; | 459 | break; |
| 464 | /* (Linux)kernel sets DF bit on outgoing IP packets */ | 460 | /* (Linux)kernel sets DF bit on outgoing IP packets */ |
| 465 | case BIO_CTRL_DGRAM_MTU_DISCOVER: | 461 | case BIO_CTRL_DGRAM_MTU_DISCOVER: |
| 466 | #if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) | 462 | #if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DO) |
| 467 | addr_len = (socklen_t)sizeof(addr); | 463 | addr_len = (socklen_t)sizeof(addr); |
| 468 | memset((void *)&addr, 0, sizeof(addr)); | 464 | memset((void *)&addr, 0, sizeof(addr)); |
| 469 | if (getsockname(b->num, &addr.sa, &addr_len) < 0) { | 465 | if (getsockname(b->num, &addr.sa, &addr_len) < 0) { |
| @@ -496,7 +492,7 @@ dgram_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 496 | break; | 492 | break; |
| 497 | #endif | 493 | #endif |
| 498 | case BIO_CTRL_DGRAM_QUERY_MTU: | 494 | case BIO_CTRL_DGRAM_QUERY_MTU: |
| 499 | #if defined(OPENSSL_SYS_LINUX) && defined(IP_MTU) | 495 | #if defined(IP_MTU) |
| 500 | addr_len = (socklen_t)sizeof(addr); | 496 | addr_len = (socklen_t)sizeof(addr); |
| 501 | memset((void *)&addr, 0, sizeof(addr)); | 497 | memset((void *)&addr, 0, sizeof(addr)); |
| 502 | if (getsockname(b->num, &addr.sa, &addr_len) < 0) { | 498 | if (getsockname(b->num, &addr.sa, &addr_len) < 0) { |