diff options
| author | Matt Caswell <matt@openssl.org> | 2015-03-19 13:31:16 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-03-19 13:31:16 +0000 |
| commit | 921095d4d3780623bfb0e2115026ceb6b6ef5a67 (patch) | |
| tree | 4792ef78d8b1e72cdc6f275574ff776f94cbd381 | |
| parent | 5cc6509dae697f0e74aaba73e1635f269a9c5e61 (diff) | |
make update
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | crypto/bio/bio.h | 1 | ||||
| -rw-r--r-- | crypto/bio/bio_err.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index 60083bfde0..7878fb1984 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -833,6 +833,7 @@ void ERR_load_BIO_strings(void); # define BIO_F_CONN_CTRL 127 # define BIO_F_CONN_STATE 115 # define BIO_F_DGRAM_SCTP_READ 132 +# define BIO_F_DGRAM_SCTP_WRITE 133 # 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 e8d3027c6a..d9007aa3d3 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-2011 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2015 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 @@ -96,6 +96,7 @@ static ERR_STRING_DATA BIO_str_functs[] = { {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_DGRAM_SCTP_WRITE), "DGRAM_SCTP_WRITE"}, {ERR_FUNC(BIO_F_FILE_CTRL), "FILE_CTRL"}, {ERR_FUNC(BIO_F_FILE_READ), "FILE_READ"}, {ERR_FUNC(BIO_F_LINEBUFFER_CTRL), "LINEBUFFER_CTRL"}, |