[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  7c82e339a677f8546e1456c7a8f6788598a9de43 (commit)
      from  2383a74be14d26d57bf7e56a2f2688705577d5e7 (commit)


- Log -----------------------------------------------------------------
commit 7c82e339a677f8546e1456c7a8f6788598a9de43
Author: Mike Frysinger <vapier at gentoo.org>
Date:   Sat Mar 21 05:08:41 2015 -0400

    Fix malloc define typo
    
    Fix compilation failure when SCTP is compiled due to incorrect define.
    
    Reported-by: Conrad Kostecki <ck+gentoobugzilla at bl4ckb0x.de>
    URL: https://bugs.gentoo.org/543828
    
    RT#3758
    Signed-off-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

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

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

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index aef8149..ed275d1 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -1338,7 +1338,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl)
                 (socklen_t) (sizeof(sctp_assoc_t) + 256 * sizeof(uint8_t));
             authchunks = OPENSSL_malloc(optlen);
             if (!authchunks) {
-                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_ERROR);
+                BIOerr(BIO_F_DGRAM_SCTP_READ, ERR_R_MALLOC_FAILURE);
                 return -1;
             }
             memset(authchunks, 0, optlen);
@@ -1410,7 +1410,7 @@ static int dgram_sctp_write(BIO *b, const char *in, int inl)
         char *tmp;
         data->saved_message.bio = b;
         if(!(tmp = OPENSSL_malloc(inl))) {
-            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_ERROR);
+            BIOerr(BIO_F_DGRAM_SCTP_WRITE, ERR_R_MALLOC_FAILURE);
             return -1;
         }
         if (data->saved_message.data)