← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/o_time.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/o_time.c
64
64
#include "o_time.h"
65
65
 
66
66
#ifdef OPENSSL_SYS_VMS
67
 
# include <libdtdef.h>
68
 
# include <lib$routines.h>
69
 
# include <lnmdef.h>
70
 
# include <starlet.h>
71
 
# include <descrip.h>
72
 
# include <stdlib.h>
 
67
# if __CRTL_VER >= 70000000 && \
 
68
     (defined _POSIX_C_SOURCE || !defined _ANSI_C_SOURCE)
 
69
#  define VMS_GMTIME_OK
 
70
# endif
 
71
# ifndef VMS_GMTIME_OK
 
72
#  include <libdtdef.h>
 
73
#  include <lib$routines.h>
 
74
#  include <lnmdef.h>
 
75
#  include <starlet.h>
 
76
#  include <descrip.h>
 
77
#  include <stdlib.h>
 
78
# endif /* ndef VMS_GMTIME_OK */
73
79
#endif
74
80
 
75
81
struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result)
81
87
           so we don't even look at the return value */
82
88
        gmtime_r(timer,result);
83
89
        ts = result;
84
 
#elif !defined(OPENSSL_SYS_VMS)
 
90
#elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
85
91
        ts = gmtime(timer);
86
92
        if (ts == NULL)
87
93
                return NULL;
89
95
        memcpy(result, ts, sizeof(struct tm));
90
96
        ts = result;
91
97
#endif
92
 
#ifdef OPENSSL_SYS_VMS
 
98
#if defined( OPENSSL_SYS_VMS) && !defined( VMS_GMTIME_OK)
93
99
        if (ts == NULL)
94
100
                {
95
101
                static $DESCRIPTOR(tabnam,"LNM$DCL_LOGICAL");