← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/conf/conf_err.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/conf/conf_err.c
1
1
/* crypto/conf/conf_err.c */
2
2
/* ====================================================================
3
 
 * Copyright (c) 1999-2005 The OpenSSL Project.  All rights reserved.
 
3
 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
4
4
 *
5
5
 * Redistribution and use in source and binary forms, with or without
6
6
 * modification, are permitted provided that the following conditions
75
75
{ERR_FUNC(CONF_F_CONF_LOAD_BIO),        "CONF_load_bio"},
76
76
{ERR_FUNC(CONF_F_CONF_LOAD_FP), "CONF_load_fp"},
77
77
{ERR_FUNC(CONF_F_CONF_MODULES_LOAD),    "CONF_modules_load"},
 
78
{ERR_FUNC(CONF_F_CONF_PARSE_LIST),      "CONF_parse_list"},
78
79
{ERR_FUNC(CONF_F_DEF_LOAD),     "DEF_LOAD"},
79
80
{ERR_FUNC(CONF_F_DEF_LOAD_BIO), "DEF_LOAD_BIO"},
80
81
{ERR_FUNC(CONF_F_MODULE_INIT),  "MODULE_INIT"},
97
98
static ERR_STRING_DATA CONF_str_reasons[]=
98
99
        {
99
100
{ERR_REASON(CONF_R_ERROR_LOADING_DSO)    ,"error loading dso"},
 
101
{ERR_REASON(CONF_R_LIST_CANNOT_BE_NULL)  ,"list cannot be null"},
100
102
{ERR_REASON(CONF_R_MISSING_CLOSE_SQUARE_BRACKET),"missing close square bracket"},
101
103
{ERR_REASON(CONF_R_MISSING_EQUAL_SIGN)   ,"missing equal sign"},
102
104
{ERR_REASON(CONF_R_MISSING_FINISH_FUNCTION),"missing finish function"},