← Back to branch summary

~sbeattie/ubuntu/oneiric/openssl/lp850608

« back to all changes in this revision

Viewing changes to apps/progs.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:
apps/progs.h
22
22
extern int x509_main(int argc,char *argv[]);
23
23
extern int genrsa_main(int argc,char *argv[]);
24
24
extern int gendsa_main(int argc,char *argv[]);
 
25
extern int genpkey_main(int argc,char *argv[]);
25
26
extern int s_server_main(int argc,char *argv[]);
26
27
extern int s_client_main(int argc,char *argv[]);
27
28
extern int speed_main(int argc,char *argv[]);
35
36
extern int nseq_main(int argc,char *argv[]);
36
37
extern int pkcs12_main(int argc,char *argv[]);
37
38
extern int pkcs8_main(int argc,char *argv[]);
 
39
extern int pkey_main(int argc,char *argv[]);
 
40
extern int pkeyparam_main(int argc,char *argv[]);
 
41
extern int pkeyutl_main(int argc,char *argv[]);
38
42
extern int spkac_main(int argc,char *argv[]);
39
43
extern int smime_main(int argc,char *argv[]);
40
44
extern int rand_main(int argc,char *argv[]);
41
45
extern int engine_main(int argc,char *argv[]);
42
46
extern int ocsp_main(int argc,char *argv[]);
43
47
extern int prime_main(int argc,char *argv[]);
 
48
extern int ts_main(int argc,char *argv[]);
44
49
 
45
50
#define FUNC_TYPE_GENERAL       1
46
51
#define FUNC_TYPE_MD            2
47
52
#define FUNC_TYPE_CIPHER        3
 
53
#define FUNC_TYPE_PKEY          4
 
54
#define FUNC_TYPE_MD_ALG        5
 
55
#define FUNC_TYPE_CIPHER_ALG    6
48
56
 
49
57
typedef struct {
50
58
        int type;
51
59
        const char *name;
52
60
        int (*func)(int argc,char *argv[]);
53
61
        } FUNCTION;
 
62
DECLARE_LHASH_OF(FUNCTION);
54
63
 
55
64
FUNCTION functions[] = {
56
65
        {FUNC_TYPE_GENERAL,"verify",verify_main},
96
105
#ifndef OPENSSL_NO_DSA
97
106
        {FUNC_TYPE_GENERAL,"gendsa",gendsa_main},
98
107
#endif
 
108
        {FUNC_TYPE_GENERAL,"genpkey",genpkey_main},
99
109
#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
100
110
        {FUNC_TYPE_GENERAL,"s_server",s_server_main},
101
111
#endif
123
133
        {FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main},
124
134
#endif
125
135
        {FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main},
 
136
        {FUNC_TYPE_GENERAL,"pkey",pkey_main},
 
137
        {FUNC_TYPE_GENERAL,"pkeyparam",pkeyparam_main},
 
138
        {FUNC_TYPE_GENERAL,"pkeyutl",pkeyutl_main},
126
139
        {FUNC_TYPE_GENERAL,"spkac",spkac_main},
127
140
        {FUNC_TYPE_GENERAL,"smime",smime_main},
128
141
        {FUNC_TYPE_GENERAL,"rand",rand_main},
129
142
#ifndef OPENSSL_NO_ENGINE
130
143
        {FUNC_TYPE_GENERAL,"engine",engine_main},
131
144
#endif
 
145
#ifndef OPENSSL_NO_OCSP
132
146
        {FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
 
147
#endif
133
148
        {FUNC_TYPE_GENERAL,"prime",prime_main},
 
149
        {FUNC_TYPE_GENERAL,"ts",ts_main},
134
150
#ifndef OPENSSL_NO_MD2
135
151
        {FUNC_TYPE_MD,"md2",dgst_main},
136
152
#endif
189
205
        {FUNC_TYPE_CIPHER,"camellia-256-ecb",enc_main},
190
206
#endif
191
207
        {FUNC_TYPE_CIPHER,"base64",enc_main},
 
208
#ifdef ZLIB
 
209
        {FUNC_TYPE_CIPHER,"zlib",enc_main},
 
210
#endif
192
211
#ifndef OPENSSL_NO_DES
193
212
        {FUNC_TYPE_CIPHER,"des",enc_main},
194
213
#endif