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

« back to all changes in this revision

Viewing changes to ssl/ssl_lib.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-11 13:27:31 UTC
  • mfrom: (11.1.27 sid)
  • Revision ID: package-import@ubuntu.com-20120211132731-ff58ncra13oof2r1
Tags: 1.0.0g-1ubuntu1
* Resynchronise with Debian. Remaining changes:
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification on libssl1.0.0
      upgrade on servers.
    + 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: i586 (on i386)
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
  - Unapply patch c_rehash-multi and comment it out in the series as it
    breaks parsing of certificates with CRLF line endings and other cases
    (see Debian #642314 for discussion), it also changes the semantics of
    c_rehash directories by requiring applications to parse hash link
    targets as files containing potentially *multiple* certificates
    rather than exactly one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1054
1054
                s->max_cert_list=larg;
1055
1055
                return(l);
1056
1056
        case SSL_CTRL_SET_MTU:
 
1057
#ifndef OPENSSL_NO_DTLS1
 
1058
                if (larg < (long)dtls1_min_mtu())
 
1059
                        return 0;
 
1060
#endif
 
1061
 
1057
1062
                if (SSL_version(s) == DTLS1_VERSION ||
1058
1063
                    SSL_version(s) == DTLS1_BAD_VER)
1059
1064
                        {
3042
3047
IMPLEMENT_STACK_OF(SSL_COMP)
3043
3048
IMPLEMENT_OBJ_BSEARCH_GLOBAL_CMP_FN(SSL_CIPHER, SSL_CIPHER,
3044
3049
                                    ssl_cipher_id);
3045