← Back to branch summary

~ubuntu-branches/ubuntu/lucid/seamonkey/lucid-security

« back to all changes in this revision

Viewing changes to security/nss/lib/pk11wrap/pk11kea.c

  • Committer: Bazaar Package Importer
  • Author(s): Fabien Tassin
  • Date: 2008-07-29 21:29:02 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080729212902-spm9kpvchp9udwbw
Tags: 1.1.11+nobinonly-0ubuntu1
https://launchpad.net/bugs/218534
* New security upstream release: 1.1.11 (LP: #218534)
  Fixes USN-602-1, USN-619-1, USN-623-1 and USN-629-1
* Refresh diverged patch:
  - update debian/patches/80_security_build.patch
* Fix FTBFS with missing -lfontconfig
  - add debian/patches/11_fix_ftbfs_with_fontconfig.patch
  - update debian/patches/series
* Build with default gcc (hardy: 4.2, intrepid: 4.3)
  - update debian/rules
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
security/nss/lib/pk11wrap/pk11kea.c
144
144
        if (rv == SECSuccess) {
145
145
            newSymKey = PK11_PubUnwrapSymKeyWithFlagsPerm(privKey,
146
146
                        &wrapData,type,operation,symKeyLength,flags,isPerm);
 
147
            /* make sure we wound up where we wanted to be! */
 
148
            if (newSymKey && newSymKey->slot != slot) {
 
149
                PK11_FreeSymKey(newSymKey);
 
150
                newSymKey = NULL;
 
151
            }
147
152
        }
148
153
rsa_failed:
149
154
        if (wrapData.data != NULL) PORT_Free(wrapData.data);