← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openssl/utopic

« back to all changes in this revision

Viewing changes to apps/progs.h

  • Committer: Package Import Robot
  • Author(s): Kurt Roeckx
  • Date: 2012-03-19 18:23:32 UTC
  • mfrom: (1.2.6)
  • mto: This revision was merged to the branch mainline in revision 64.
  • Revision ID: package-import@ubuntu.com-20120319182332-q4zgqvw51ahauk27
Tags: 1.0.1-1
http://bugs.debian.org/644743
http://bugs.debian.org/663977
http://bugs.debian.org/653495
http://bugs.debian.org/664454
* New upstream version
  - Remove kfreebsd-pipe.patch, fixed upstream
  - Update pic.patch, openssl-pod-misspell.patch and make-targets.patch
  - Add OPENSSL_1.0.1 to version-script.patch and libssl1.0.0.symbols for
    the new functions.
  - AES-NI support (Closes: #644743)
* pic.patch: upstream made OPENSSL_ia32cap_P and OPENSSL_cpuid_setup
  hidden on amd64, no need to access it PIC anymore.
* pic.patch: Make OPENSSL_ia32cap_P hidden on i386 too (Closes: #663977)
* Enable hardening using dpkg-buildflags (Closes: #653495)
* s_client and s_server were forcing SSLv3 only connection when SSLv2 was
  disabled instead of the SSLv2 with upgrade method.  (Closes: #664454)
* Add Beaks on openssh < 1:5.9p1-4, it has a too strict version check.

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/progs.h
46
46
extern int ocsp_main(int argc,char *argv[]);
47
47
extern int prime_main(int argc,char *argv[]);
48
48
extern int ts_main(int argc,char *argv[]);
 
49
extern int srp_main(int argc,char *argv[]);
49
50
 
50
51
#define FUNC_TYPE_GENERAL       1
51
52
#define FUNC_TYPE_MD            2
147
148
#endif
148
149
        {FUNC_TYPE_GENERAL,"prime",prime_main},
149
150
        {FUNC_TYPE_GENERAL,"ts",ts_main},
 
151
#ifndef OPENSSL_NO_SRP
 
152
        {FUNC_TYPE_GENERAL,"srp",srp_main},
 
153
#endif
150
154
#ifndef OPENSSL_NO_MD2
151
155
        {FUNC_TYPE_MD,"md2",dgst_main},
152
156
#endif