From: Dr. Stephen Henson Date: Tue, 27 Dec 2011 14:40:21 +0000 (+0000) Subject: fix error code X-Git-Tag: master-post-reformat~2019 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ffdfce8d14f43b07a330e90ee5f84657f1f54aa4;p=oweals%2Fopenssl.git fix error code --- diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index b4a1bd21b4..60573c624f 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -796,6 +796,7 @@ void ERR_load_BIO_strings(void); #define BIO_F_BUFFER_CTRL 114 #define BIO_F_CONN_CTRL 127 #define BIO_F_CONN_STATE 115 +#define BIO_F_DGRAM_SCTP_READ 132 #define BIO_F_FILE_CTRL 116 #define BIO_F_FILE_READ 130 #define BIO_F_LINEBUFFER_CTRL 129 diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c index a224edd5a0..0dbfbd80d3 100644 --- a/crypto/bio/bio_err.c +++ b/crypto/bio/bio_err.c @@ -1,6 +1,6 @@ /* crypto/bio/bio_err.c */ /* ==================================================================== - * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -95,6 +95,7 @@ static ERR_STRING_DATA BIO_str_functs[]= {ERR_FUNC(BIO_F_BUFFER_CTRL), "BUFFER_CTRL"}, {ERR_FUNC(BIO_F_CONN_CTRL), "CONN_CTRL"}, {ERR_FUNC(BIO_F_CONN_STATE), "CONN_STATE"}, +{ERR_FUNC(BIO_F_DGRAM_SCTP_READ), "DGRAM_SCTP_READ"}, {ERR_FUNC(BIO_F_FILE_CTRL), "FILE_CTRL"}, {ERR_FUNC(BIO_F_FILE_READ), "FILE_READ"}, {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "LINEBUFFER_CTRL"}, diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c index c197219167..4d1a64ea35 100644 --- a/crypto/bio/bss_dgram.c +++ b/crypto/bio/bss_dgram.c @@ -1155,7 +1155,7 @@ static int dgram_sctp_read(BIO *b, char *out, int outl) if (!auth_data || !auth_forward) { - BIOerr(BIO_F_BIO_READ,BIO_R_CONNECT_ERROR); + BIOerr(BIO_F_DGRAM_SCTP_READ,BIO_R_CONNECT_ERROR); return -1; }