~ubuntu-branches/ubuntu/lucid/openssl/lucid-security

« back to all changes in this revision

Viewing changes to crypto/opensslconf.h

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2008-08-03 19:47:10 UTC
  • mfrom: (1.1.6 upstream) (14 gutsy)
  • mto: This revision was merged to the branch mainline in revision 26.
  • Revision ID: james.westby@ubuntu.com-20080803194710-dwlvv1y2pyzi3in2
Tags: 0.9.8g-13
Fix a problem with tlsext preventing firefox 3 from connection.
Patch from upstream CVS and part of 0.9.8h.
(Closes: #492758)

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
#ifndef OPENSSL_NO_RC5
23
23
# define OPENSSL_NO_RC5
24
24
#endif
 
25
#ifndef OPENSSL_NO_RFC3779
 
26
# define OPENSSL_NO_RFC3779
 
27
#endif
 
28
#ifndef OPENSSL_NO_SEED
 
29
# define OPENSSL_NO_SEED
 
30
#endif
25
31
 
26
32
#endif /* OPENSSL_DOING_MAKEDEPEND */
27
33
#ifndef OPENSSL_THREADS
54
60
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
55
61
#  define NO_RC5
56
62
# endif
 
63
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
 
64
#  define NO_RFC3779
 
65
# endif
 
66
# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
 
67
#  define NO_SEED
 
68
# endif
57
69
#endif
58
70
 
59
71
#define OPENSSL_CPUID_OBJ