← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/objects/obj_xref.h

  • 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/objects/obj_xref.h
 
1
/* AUTOGENERATED BY objxref.pl, DO NOT EDIT */
 
2
 
 
3
typedef struct
 
4
        {
 
5
        int sign_id;
 
6
        int hash_id;
 
7
        int pkey_id;
 
8
        } nid_triple;
 
9
 
 
10
static const nid_triple sigoid_srt[] =
 
11
        {
 
12
        {NID_md2WithRSAEncryption, NID_md2, NID_rsaEncryption},
 
13
        {NID_md5WithRSAEncryption, NID_md5, NID_rsaEncryption},
 
14
        {NID_shaWithRSAEncryption, NID_sha, NID_rsaEncryption},
 
15
        {NID_sha1WithRSAEncryption, NID_sha1, NID_rsaEncryption},
 
16
        {NID_dsaWithSHA, NID_sha, NID_dsa},
 
17
        {NID_dsaWithSHA1_2, NID_sha1, NID_dsa_2},
 
18
        {NID_mdc2WithRSA, NID_mdc2, NID_rsaEncryption},
 
19
        {NID_md5WithRSA, NID_md5, NID_rsa},
 
20
        {NID_dsaWithSHA1, NID_sha1, NID_dsa},
 
21
        {NID_sha1WithRSA, NID_sha1, NID_rsa},
 
22
        {NID_ripemd160WithRSA, NID_ripemd160, NID_rsaEncryption},
 
23
        {NID_md4WithRSAEncryption, NID_md4, NID_rsaEncryption},
 
24
        {NID_ecdsa_with_SHA1, NID_sha1, NID_X9_62_id_ecPublicKey},
 
25
        {NID_sha256WithRSAEncryption, NID_sha256, NID_rsaEncryption},
 
26
        {NID_sha384WithRSAEncryption, NID_sha384, NID_rsaEncryption},
 
27
        {NID_sha512WithRSAEncryption, NID_sha512, NID_rsaEncryption},
 
28
        {NID_sha224WithRSAEncryption, NID_sha224, NID_rsaEncryption},
 
29
        {NID_ecdsa_with_Recommended, NID_undef, NID_X9_62_id_ecPublicKey},
 
30
        {NID_ecdsa_with_Specified, NID_undef, NID_X9_62_id_ecPublicKey},
 
31
        {NID_ecdsa_with_SHA224, NID_sha224, NID_X9_62_id_ecPublicKey},
 
32
        {NID_ecdsa_with_SHA256, NID_sha256, NID_X9_62_id_ecPublicKey},
 
33
        {NID_ecdsa_with_SHA384, NID_sha384, NID_X9_62_id_ecPublicKey},
 
34
        {NID_ecdsa_with_SHA512, NID_sha512, NID_X9_62_id_ecPublicKey},
 
35
        {NID_dsa_with_SHA224, NID_sha224, NID_dsa},
 
36
        {NID_dsa_with_SHA256, NID_sha256, NID_dsa},
 
37
        {NID_id_GostR3411_94_with_GostR3410_2001, NID_id_GostR3411_94, NID_id_GostR3410_2001},
 
38
        {NID_id_GostR3411_94_with_GostR3410_94, NID_id_GostR3411_94, NID_id_GostR3410_94},
 
39
        {NID_id_GostR3411_94_with_GostR3410_94_cc, NID_id_GostR3411_94, NID_id_GostR3410_94_cc},
 
40
        {NID_id_GostR3411_94_with_GostR3410_2001_cc, NID_id_GostR3411_94, NID_id_GostR3410_2001_cc},
 
41
        };
 
42
 
 
43
static const nid_triple * const sigoid_srt_xref[] =
 
44
        {
 
45
        &sigoid_srt[17],
 
46
        &sigoid_srt[18],
 
47
        &sigoid_srt[0],
 
48
        &sigoid_srt[1],
 
49
        &sigoid_srt[7],
 
50
        &sigoid_srt[2],
 
51
        &sigoid_srt[4],
 
52
        &sigoid_srt[3],
 
53
        &sigoid_srt[9],
 
54
        &sigoid_srt[5],
 
55
        &sigoid_srt[8],
 
56
        &sigoid_srt[12],
 
57
        &sigoid_srt[6],
 
58
        &sigoid_srt[10],
 
59
        &sigoid_srt[11],
 
60
        &sigoid_srt[13],
 
61
        &sigoid_srt[24],
 
62
        &sigoid_srt[20],
 
63
        &sigoid_srt[14],
 
64
        &sigoid_srt[21],
 
65
        &sigoid_srt[15],
 
66
        &sigoid_srt[22],
 
67
        &sigoid_srt[16],
 
68
        &sigoid_srt[23],
 
69
        &sigoid_srt[19],
 
70
        &sigoid_srt[25],
 
71
        &sigoid_srt[26],
 
72
        &sigoid_srt[27],
 
73
        &sigoid_srt[28],
 
74
        };
 
75