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

« back to all changes in this revision

Viewing changes to ssl/s23_srvr.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2009-06-13 18:15:46 UTC
  • mto: (11.1.5 squeeze)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: james.westby@ubuntu.com-20090613181546-vbfntai3b009dl1u
Tags: upstream-0.9.8k
ImportĀ upstreamĀ versionĀ 0.9.8k

Show diffs side-by-side

added added

removed removed

Lines of Context:
386
386
                        }
387
387
                }
388
388
 
 
389
#ifdef OPENSSL_FIPS
 
390
        if (FIPS_mode() && (s->version < TLS1_VERSION))
 
391
                {
 
392
                SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO,
 
393
                                        SSL_R_ONLY_TLS_ALLOWED_IN_FIPS_MODE);
 
394
                goto err;
 
395
                }
 
396
#endif
 
397
 
389
398
        if (s->state == SSL23_ST_SR_CLNT_HELLO_B)
390
399
                {
391
400
                /* we have SSLv3/TLSv1 in an SSLv2 header