The usual idiom to cope with systems not defining socklen_t is to add a

#define socklen_t int
somewhere (or a typedef, whatever gives you an integer type of the size
your system expects as the 3rd argument of accept(2), really).

OpenSSL here is a bit more creative by using an union of an int and a size_t,
and extra code if sizeof(int) != sizeof(size_t) in order to recover the
proper size. With a comment mentioning that this has no chance to work on
a platform with a stack growing up and accept() returning an int, fortunately
this seems to work on HP-UX.

Switch to the light side of the force and declare and use socklen_t variables,
period. If your system does not define socklen_t, consider bringing it back
to your vendor for a refund.

ok matthew@ tedu@

1 files changed, 3 insertions, 14 deletions

diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index a3b5bb6574..ab269aeba3 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -331,13 +331,7 @@ dgram_read(BIO *b, char *out, int outl)
         bio_dgram_data *data = (bio_dgram_data *)b->ptr;
 
         struct  {
-                /*
-                 * See commentary in b_sock.c. <appro>
-                 */
-                union   {
-                        size_t s;
-                        int i;
-                } len;
+                socklen_t len;
                 union   {
                         struct sockaddr sa;
                         struct sockaddr_in sa_in;
@@ -345,18 +339,13 @@ dgram_read(BIO *b, char *out, int outl)
                 } peer;
         } sa;
 
-        sa.len.s = 0;
-        sa.len.i = sizeof(sa.peer);
+        sa.len = sizeof(sa.peer);
 
         if (out != NULL) {
                 errno = 0;
                 memset(&sa.peer, 0x00, sizeof(sa.peer));
                 dgram_adjust_rcv_timeout(b);
-                ret = recvfrom(b->num, out, outl, 0, &sa.peer.sa,(void *)&sa.len);
-                if (sizeof(sa.len.i) != sizeof(sa.len.s) && sa.len.i == 0) {
-                        OPENSSL_assert(sa.len.s <= sizeof(sa.peer));
-                        sa.len.i = (int)sa.len.s;
-                }
+                ret = recvfrom(b->num, out, outl, 0, &sa.peer.sa, &sa.len);
 
                 if (! data->connected  && ret >= 0)
                         BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &sa.peer);