← Back to branch summary

~ubuntu-branches/ubuntu/maverick/openssl/maverick

« back to all changes in this revision

Viewing changes to ssl/ssl_cert.c

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2010-06-14 09:08:29 UTC
  • mfrom: (11.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20100614090829-nf3nrftn7ly58mxv
Tags: 0.9.8o-1ubuntu1
https://launchpad.net/bugs/581167
https://launchpad.net/bugs/503339
https://launchpad.net/bugs/485518
* Merge from debian unstable, remaining changes (LP: #581167):
  - debian/patches/Bsymbolic-functions.patch: Link using
    -Bsymbolic-functions
  - 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
  - Use host compiler when cross-building (patch from Neil Williams in
    Debian #465248).
  - Don't run 'make test' when cross-building.
  - Create libssl0.9.8-udeb, for the benefit of wget-udeb (LP: #503339).
  - debian/patches/aesni.patch: Backport Intel AES-NI support from
    http://rt.openssl.org/Ticket/Display.html?id=2067 (LP: #485518).
  - debian/patches/perlpath-quilt.patch: Don't change perl #! paths
    under .pc.
* Dropped patches, now upstream:
  - debian/patches/CVE-2009-3245.patch
  - debian/patches/CVE-2010-0740.patch
  - debian/patches/dtls-compatibility.patch
  - debian/patches/CVE-2009-4355.patch
* Dropped "Add support for lpia".
* Dropped "Disable SSLv2 during compile" as this had never actually
  disabled SSLv2.
* Don't disable CVE-2009-3555.patch for Maverick.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ssl/ssl_cert.c
500
500
                SSLerr(SSL_F_SSL_VERIFY_CERT_CHAIN,ERR_R_X509_LIB);
501
501
                return(0);
502
502
                }
503
 
        if (s->param)
504
 
                X509_VERIFY_PARAM_inherit(X509_STORE_CTX_get0_param(&ctx),
505
 
                                                s->param);
506
503
#if 0
507
504
        if (SSL_get_verify_depth(s) >= 0)
508
505
                X509_STORE_CTX_set_depth(&ctx, SSL_get_verify_depth(s));
516
513
 
517
514
        X509_STORE_CTX_set_default(&ctx,
518
515
                                s->server ? "ssl_client" : "ssl_server");
 
516
        /* Anything non-default in "param" should overwrite anything in the
 
517
         * ctx.
 
518
         */
 
519
        X509_VERIFY_PARAM_set1(X509_STORE_CTX_get0_param(&ctx), s->param);
519
520
 
520
521
        if (s->verify_callback)
521
522
                X509_STORE_CTX_set_verify_cb(&ctx, s->verify_callback);
752
753
                        sk_X509_NAME_push(stack,xn);
753
754
                }
754
755
 
 
756
        ERR_clear_error();
 
757
 
755
758
        if (0)
756
759
                {
757
760
err: