← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/engine/eng_all.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-01 23:51:53 UTC
  • mfrom: (11.1.20 sid)
  • Revision ID: james.westby@ubuntu.com-20110501235153-bjcxitndquaezb68
Tags: 1.0.0d-2ubuntu1
https://launchpad.net/bugs/675566
* Resynchronise with Debian (LP: #675566).  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.
* Update architectures affected by Bsymbolic-functions.patch.
* Drop debian/patches/no-sslv2.patch; Debian now adds the 'no-ssl2'
  configure option, which compiles out SSLv2 support entirely, so this is
  no longer needed.
* Drop openssl-doc in favour of the libssl-doc package introduced by
  Debian.  Add Conflicts/Replaces until the next LTS release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/engine/eng_all.c
63
63
        {
64
64
        /* Engines may depend on CPU capabilities */
65
65
        OPENSSL_cpuid_setup();
 
66
#if 0
66
67
        /* There's no longer any need for an "openssl" ENGINE unless, one day,
67
68
         * it is the *only* way for standard builtin implementations to be be
68
69
         * accessed (ie. it would be possible to statically link binaries with
69
70
         * *no* builtin implementations). */
70
 
#if 0
71
71
        ENGINE_load_openssl();
72
72
#endif
73
 
#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
74
 
        ENGINE_load_padlock();
 
73
#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))
 
74
        ENGINE_load_cryptodev();
75
75
#endif
76
76
#if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_AESNI)
77
77
        ENGINE_load_aesni();
103
103
#ifndef OPENSSL_NO_HW_UBSEC
104
104
        ENGINE_load_ubsec();
105
105
#endif
106
 
#endif
107
 
#if !defined(OPENSSL_NO_GMP) && !defined(OPENSSL_NO_HW_GMP)
 
106
#ifndef OPENSSL_NO_HW_PADLOCK
 
107
        ENGINE_load_padlock();
 
108
#endif
 
109
#endif
 
110
#ifndef OPENSSL_NO_GOST
 
111
        ENGINE_load_gost();
 
112
#endif
 
113
#ifndef OPENSSL_NO_GMP
108
114
        ENGINE_load_gmp();
109
115
#endif
110
 
#endif
111
 
#ifndef OPENSSL_NO_HW
112
 
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
113
 
        ENGINE_load_cryptodev();
114
 
#endif
115
116
#if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
116
117
        ENGINE_load_capi();
117
118
#endif
119
120
        ENGINE_register_all_complete();
120
121
        }
121
122
 
122
 
#if defined(__OpenBSD__) || defined(__FreeBSD__)
 
123
#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
123
124
void ENGINE_setup_bsd_cryptodev(void) {
124
125
        static int bsd_cryptodev_default_loaded = 0;
125
126
        if (!bsd_cryptodev_default_loaded) {