← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssl/lucid-security

« back to all changes in this revision

Viewing changes to crypto/pkcs7/pk7_mime.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2008-08-03 19:47:10 UTC
  • mfrom: (1.1.6 upstream) (14 gutsy)
  • mto: This revision was merged to the branch mainline in revision 26.
  • Revision ID: james.westby@ubuntu.com-20080803194710-dwlvv1y2pyzi3in2
Tags: 0.9.8g-13
http://bugs.debian.org/492758
Fix a problem with tlsext preventing firefox 3 from connection.
Patch from upstream CVS and part of 0.9.8h.
(Closes: #492758)

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/pkcs7/pk7_mime.c
121
121
        }
122
122
        bio = BIO_push(b64, bio);
123
123
        i2d_PKCS7_bio(bio, p7);
124
 
        BIO_flush(bio);
 
124
        (void)BIO_flush(bio);
125
125
        bio = BIO_pop(bio);
126
126
        BIO_free(b64);
127
127
        return 1;
138
138
        bio = BIO_push(b64, bio);
139
139
        if(!(p7 = d2i_PKCS7_bio(bio, NULL))) 
140
140
                PKCS7err(PKCS7_F_B64_READ_PKCS7,PKCS7_R_DECODE_ERROR);
141
 
        BIO_flush(bio);
 
141
        (void)BIO_flush(bio);
142
142
        bio = BIO_pop(bio);
143
143
        BIO_free(b64);
144
144
        return p7;