~ubuntu-branches/ubuntu/lucid/openssl/lucid-proposed

« back to all changes in this revision

Viewing changes to ssl/ssl_stat.c

  • Committer: Bazaar Package Importer
  • Author(s): Nicolas Valcárcel Scerpella (Canonical)
  • Date: 2009-12-06 20:16:24 UTC
  • mfrom: (11.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091206201624-u126qjpqm2n2uuhu
Tags: 0.9.8k-7ubuntu1
* Merge from debian unstable, remaining changes (LP: #493392):
  - Link using -Bsymbolic-functions
  - Add support for lpia
  - Disable SSLv2 during compile
  - Ship documentation in openssl-doc, suggested by the package.
  - Use a different priority for libssl0.9.8/restart-services
    depending on whether a desktop, or server dist-upgrade is being
    performed.
  - Display a system restart required notification bubble on libssl0.9.8
    upgrade.
  - Replace duplicate files in the doc directory with symlinks.
  - Move runtime libraries to /lib, for the benefit of wpasupplicant
* Strip the patches out of the source into quilt patches
* Disable CVE-2009-3555.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
127
127
case SSL3_ST_CR_KEY_EXCH_B:     str="SSLv3 read server key exchange B"; break;
128
128
case SSL3_ST_CR_CERT_REQ_A:     str="SSLv3 read server certificate request A"; break;
129
129
case SSL3_ST_CR_CERT_REQ_B:     str="SSLv3 read server certificate request B"; break;
 
130
case SSL3_ST_CR_SESSION_TICKET_A: str="SSLv3 read server session ticket A";break;
 
131
case SSL3_ST_CR_SESSION_TICKET_B: str="SSLv3 read server session ticket B";break;
130
132
case SSL3_ST_CR_SRVR_DONE_A:    str="SSLv3 read server done A"; break;
131
133
case SSL3_ST_CR_SRVR_DONE_B:    str="SSLv3 read server done B"; break;
132
134
case SSL3_ST_CW_CERT_A:         str="SSLv3 write client certificate A"; break;
172
174
case SSL3_ST_SW_KEY_EXCH_B:     str="SSLv3 write key exchange B"; break;
173
175
case SSL3_ST_SW_CERT_REQ_A:     str="SSLv3 write certificate request A"; break;
174
176
case SSL3_ST_SW_CERT_REQ_B:     str="SSLv3 write certificate request B"; break;
 
177
case SSL3_ST_SW_SESSION_TICKET_A: str="SSLv3 write session ticket A"; break;
 
178
case SSL3_ST_SW_SESSION_TICKET_B: str="SSLv3 write session ticket B"; break;
175
179
case SSL3_ST_SW_SRVR_DONE_A:    str="SSLv3 write server done A"; break;
176
180
case SSL3_ST_SW_SRVR_DONE_B:    str="SSLv3 write server done B"; break;
177
181
case SSL3_ST_SR_CERT_A:         str="SSLv3 read client certificate A"; break;