From: Richard Levitte <levitte@openssl.org>
Date: Mon, 2 Nov 2015 15:43:28 +0000 (+0100)
Subject: BIO_s_datagram() ctrl doesn't support SEEK/TELL, so don't pretend it does
X-Git-Tag: OpenSSL_1_1_0-pre1~310
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2443030466c3715a9c48770022df72dab7acbb51;p=oweals%2Fopenssl.git

BIO_s_datagram() ctrl doesn't support SEEK/TELL, so don't pretend it does

Reviewed-by: Andy Polyakov <appro@openssl.org>
---

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index e7371c9ef3..9c6af4bc9d 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -512,10 +512,8 @@ static long dgram_ctrl(BIO *b, int cmd, long num, void *ptr)
     switch (cmd) {
     case BIO_CTRL_RESET:
         num = 0;
-    case BIO_C_FILE_SEEK:
         ret = 0;
         break;
-    case BIO_C_FILE_TELL:
     case BIO_CTRL_INFO:
         ret = 0;
         break;
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 300811dbd0..6f099313ba 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -496,7 +496,7 @@ struct bio_dgram_sctp_prinfo {
 # define BIO_set_fp(b,fp,c)      BIO_ctrl(b,BIO_C_SET_FILE_PTR,c,(char *)fp)
 # define BIO_get_fp(b,fpp)       BIO_ctrl(b,BIO_C_GET_FILE_PTR,0,(char *)fpp)
 
-/* BIO_s_datagram(), BIO_s_fd() and BIO_s_file() */
+/* BIO_s_fd() and BIO_s_file() */
 # define BIO_seek(b,ofs) (int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)
 # define BIO_tell(b)     (int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)