← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/asn1/tasn_fre.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
https://launchpad.net/bugs/493392
* 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:
crypto/asn1/tasn_fre.c
1
1
/* tasn_fre.c */
2
 
/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
 
2
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3
3
 * project 2000.
4
4
 */
5
5
/* ====================================================================
115
115
                                return;
116
116
                        }
117
117
                i = asn1_get_choice_selector(pval, it);
118
 
                if (asn1_cb)
119
 
                        asn1_cb(ASN1_OP_FREE_PRE, pval, it);
120
118
                if ((i >= 0) && (i < it->tcount))
121
119
                        {
122
120
                        ASN1_VALUE **pchval;
221
219
                {
222
220
                ASN1_TYPE *typ = (ASN1_TYPE *)*pval;
223
221
                utype = typ->type;
224
 
                pval = (ASN1_VALUE **)&typ->value.ptr;
 
222
                pval = &typ->value.asn1_value;
225
223
                if (!*pval)
226
224
                        return;
227
225
                }