diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:13:04 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-13 12:13:04 +0200 |
| commit | 3a71bc9e4aa4296f460e2e3c55de74c9852477ad (patch) | |
| tree | f816597a7c4322137f0657e7aa2bf392404d1870 /app/openssl/crypto/bio/bio_err.c | |
| parent | cfe67bfd8260253ce9288225b9e26f666d27133f (diff) | |
| parent | 36247e71df88fa13c6c5a887de3b11d9a883615f (diff) | |
Merge branch 'feature/establish-an-upstream-relationship-with-ics-openvpn-codebase-#5381' into develop
Diffstat (limited to 'app/openssl/crypto/bio/bio_err.c')
| -rw-r--r-- | app/openssl/crypto/bio/bio_err.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/openssl/crypto/bio/bio_err.c b/app/openssl/crypto/bio/bio_err.c index a224edd5..0dbfbd80 100644 --- a/app/openssl/crypto/bio/bio_err.c +++ b/app/openssl/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"}, |