← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/evp/m_wp.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/evp/m_wp.c
 
1
/* crypto/evp/m_wp.c */
 
2
 
 
3
#include <stdio.h>
 
4
#include "cryptlib.h"
 
5
 
 
6
#ifndef OPENSSL_NO_WHIRLPOOL
 
7
 
 
8
#include <openssl/evp.h>
 
9
#include <openssl/objects.h>
 
10
#include <openssl/x509.h>
 
11
#include <openssl/whrlpool.h>
 
12
 
 
13
static int init(EVP_MD_CTX *ctx)
 
14
        { return WHIRLPOOL_Init(ctx->md_data); }
 
15
 
 
16
static int update(EVP_MD_CTX *ctx,const void *data,size_t count)
 
17
        { return WHIRLPOOL_Update(ctx->md_data,data,count); }
 
18
 
 
19
static int final(EVP_MD_CTX *ctx,unsigned char *md)
 
20
        { return WHIRLPOOL_Final(md,ctx->md_data); }
 
21
 
 
22
static const EVP_MD whirlpool_md=
 
23
        {
 
24
        NID_whirlpool,
 
25
        0,
 
26
        WHIRLPOOL_DIGEST_LENGTH,
 
27
        0,
 
28
        init,
 
29
        update,
 
30
        final,
 
31
        NULL,
 
32
        NULL,
 
33
        EVP_PKEY_NULL_method,
 
34
        WHIRLPOOL_BBLOCK/8,
 
35
        sizeof(EVP_MD *)+sizeof(WHIRLPOOL_CTX),
 
36
        };
 
37
 
 
38
const EVP_MD *EVP_whirlpool(void)
 
39
        {
 
40
        return(&whirlpool_md);
 
41
        }
 
42
#endif