[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  0baaff1a76d4c91b9c1121059be63175454d7b03 (commit)
      from  98ece4eebfb6cd45cc8d550c6ac0022965071afc (commit)


- Log -----------------------------------------------------------------
commit 0baaff1a76d4c91b9c1121059be63175454d7b03
Author: Per Allansson <per.allansson at cryptzone.com>
Date:   Tue Jun 2 09:38:28 2015 +0100

    Fix IP_MTU_DISCOVER typo
    
    The code in bss_dgram.c checks if IP_MTUDISCOVER is defined, where it
    should test for IP_MTU_DISCOVER
    
    RT#3888
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bss_dgram.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 5eade50..7cd57bf 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -882,7 +882,7 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
                 perror("setsockopt");
                 ret = -1;
             }
-# elif defined(OPENSSL_SYS_LINUX) && defined(IP_MTUDISCOVER)
+# elif defined(OPENSSL_SYS_LINUX) && defined(IP_MTU_DISCOVER)
             if ((sockopt_val = num ? IP_PMTUDISC_PROBE : IP_PMTUDISC_DONT),
                 (ret = setsockopt(b->num, IPPROTO_IP, IP_MTU_DISCOVER,
                                   &sockopt_val, sizeof(sockopt_val))) < 0) {