← Back to branch summary

~andersk/ubuntu/oneiric/openssl/spurious-reboot

« back to all changes in this revision

Viewing changes to crypto/bio/bss_dgram.c

  • Committer: Package Import Robot
  • Author(s): Steve Beattie
  • Date: 2011-09-14 22:06:03 UTC
  • mfrom: (11.1.23 sid)
  • Revision ID: package-import@ubuntu.com-20110914220603-tsuxw8z3kt4lx9oc
Tags: 1.0.0e-2ubuntu1
https://launchpad.net/bugs/850608
https://launchpad.net/bugs/244250
* Resynchronise with Debian, fixes CVE-2011-1945, CVE-2011-3207 and
  CVE-2011-3210 (LP: #850608). Remaining changes:
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification bubble on libssl1.0.0
      upgrade.
    + Use a different priority for libssl1.0.0/restart-services depending
      on whether a desktop, or server dist-upgrade is being performed.
  - debian/{libssl1.0.0-udeb.dirs, control, rules}: Create
    libssl1.0.0-udeb, for the benefit of wget-udeb (no wget-udeb package
    in Debian).
  - debian/{libcrypto1.0.0-udeb.dirs, libssl1.0.0.dirs, libssl1.0.0.files,
    rules}: Move runtime libraries to /lib, for the benefit of
    wpasupplicant.
  - debian/patches/aesni.patch: Backport Intel AES-NI support, now from
    http://rt.openssl.org/Ticket/Display.html?id=2065 rather than the
    0.9.8 variant.
  - debian/patches/Bsymbolic-functions.patch: Link using
    -Bsymbolic-functions.
  - debian/patches/perlpath-quilt.patch: Don't change perl #! paths under
    .pc.
  - debian/rules:
    + Don't run 'make test' when cross-building.
    + Use host compiler when cross-building.  Patch from Neil Williams.
    + Don't build for processors no longer supported: i486, i586 (on
      i386), v8 (on sparc).
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
* debian/libssl1.0.0.postinst: only display restart notification on
  servers (LP: #244250)

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/bio/bss_dgram.c
57
57
 *
58
58
 */
59
59
 
60
 
#ifndef OPENSSL_NO_DGRAM
61
60
 
62
61
#include <stdio.h>
63
62
#include <errno.h>
65
64
#include "cryptlib.h"
66
65
 
67
66
#include <openssl/bio.h>
 
67
#ifndef OPENSSL_NO_DGRAM
68
68
 
69
69
#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)
70
70
#include <sys/timeb.h>
308
308
                        OPENSSL_assert(sa.len.s<=sizeof(sa.peer));
309
309
                        sa.len.i = (int)sa.len.s;
310
310
                        }
311
 
                dgram_reset_rcv_timeout(b);
312
311
 
313
312
                if ( ! data->connected  && ret >= 0)
314
313
                        BIO_ctrl(b, BIO_CTRL_DGRAM_SET_PEER, 0, &sa.peer);
322
321
                                data->_errno = get_last_socket_error();
323
322
                                }
324
323
                        }
 
324
 
 
325
                dgram_reset_rcv_timeout(b);
325
326
                }
326
327
        return(ret);
327
328
        }
745
746
                {
746
747
                err=get_last_socket_error();
747
748
 
748
 
#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
749
 
                if ((i == -1) && (err == 0))
750
 
                        return(1);
 
749
#if defined(OPENSSL_SYS_WINDOWS)
 
750
        /* If the socket return value (i) is -1
 
751
         * and err is unexpectedly 0 at this point,
 
752
         * the error code was overwritten by
 
753
         * another system call before this error
 
754
         * handling is called.
 
755
         */
751
756
#endif
752
757
 
753
758
                return(BIO_dgram_non_fatal_error(err));
810
815
                }
811
816
        return(0);
812
817
        }
813
 
#endif
814
818
 
815
819
static void get_current_time(struct timeval *t)
816
820
        {
828
832
        gettimeofday(t, NULL);
829
833
#endif
830
834
        }
 
835
 
 
836
#endif