← Back to branch summary

~sbeattie/ubuntu/oneiric/openssl/lp850608

« back to all changes in this revision

Viewing changes to apps/progs.pl

  • 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:
apps/progs.pl
1
 
#!/usr/bin/perl
 
1
#!/usr/local/bin/perl
2
2
 
3
3
print "/* apps/progs.h */\n";
4
4
print "/* automatically generated by progs.pl for openssl.c */\n\n";
13
13
#define FUNC_TYPE_GENERAL       1
14
14
#define FUNC_TYPE_MD            2
15
15
#define FUNC_TYPE_CIPHER        3
 
16
#define FUNC_TYPE_PKEY          4
 
17
#define FUNC_TYPE_MD_ALG        5
 
18
#define FUNC_TYPE_CIPHER_ALG    6
16
19
 
17
20
typedef struct {
18
21
        int type;
19
22
        const char *name;
20
23
        int (*func)(int argc,char *argv[]);
21
24
        } FUNCTION;
 
25
DECLARE_LHASH_OF(FUNCTION);
22
26
 
23
27
FUNCTION functions[] = {
24
28
EOF
45
49
                { print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
46
50
        elsif ( ($_ =~ /^cms$/))
47
51
                { print "#ifndef OPENSSL_NO_CMS\n${str}#endif\n"; }
 
52
        elsif ( ($_ =~ /^ocsp$/))
 
53
                { print "#ifndef OPENSSL_NO_OCSP\n${str}#endif\n"; }
48
54
        else
49
55
                { print $str; }
50
56
        }
62
68
        "camellia-128-cbc", "camellia-128-ecb",
63
69
        "camellia-192-cbc", "camellia-192-ecb",
64
70
        "camellia-256-cbc", "camellia-256-ecb",
65
 
        "base64",
 
71
        "base64", "zlib",
66
72
        "des", "des3", "desx", "idea", "seed", "rc4", "rc4-40",
67
73
        "rc2", "bf", "cast", "rc5",
68
74
        "des-ecb", "des-ede",    "des-ede3",
89
95
        elsif ($_ =~ /bf/)   { $t="#ifndef OPENSSL_NO_BF\n${t}#endif\n"; }
90
96
        elsif ($_ =~ /cast/) { $t="#ifndef OPENSSL_NO_CAST\n${t}#endif\n"; }
91
97
        elsif ($_ =~ /rc5/)  { $t="#ifndef OPENSSL_NO_RC5\n${t}#endif\n"; }
 
98
        elsif ($_ =~ /zlib/)  { $t="#ifdef ZLIB\n${t}#endif\n"; }
92
99
        print $t;
93
100
        }
94
101