← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/pidgin/intrepid-proposed

« back to all changes in this revision

Viewing changes to libpurple/plugins/ssl/ssl-nss.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-10-22 21:51:41 UTC
  • mfrom: (1.1.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20081022215141-ps1xypyvtql9kqwa
Tags: 1:2.5.2-0ubuntu1
* New upstream version
* debian/patches/06_ssl_null_pointer_deref.patch:
  - the change is in the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/plugins/ssl/ssl-nss.c
141
141
        g_free(lib);
142
142
        NSS_SetDomesticPolicy();
143
143
 
 
144
        SSL_CipherPrefSetDefault(TLS_DHE_RSA_WITH_AES_256_CBC_SHA, 1);
 
145
        SSL_CipherPrefSetDefault(TLS_DHE_DSS_WITH_AES_256_CBC_SHA, 1);
 
146
        SSL_CipherPrefSetDefault(TLS_RSA_WITH_AES_256_CBC_SHA, 1);
 
147
        SSL_CipherPrefSetDefault(TLS_DHE_DSS_WITH_RC4_128_SHA, 1);
 
148
        SSL_CipherPrefSetDefault(TLS_DHE_RSA_WITH_AES_128_CBC_SHA, 1);
 
149
        SSL_CipherPrefSetDefault(TLS_DHE_DSS_WITH_AES_128_CBC_SHA, 1);
 
150
        SSL_CipherPrefSetDefault(SSL_RSA_WITH_RC4_128_SHA, 1);
 
151
        SSL_CipherPrefSetDefault(TLS_RSA_WITH_AES_128_CBC_SHA, 1);
 
152
        SSL_CipherPrefSetDefault(SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA, 1);
 
153
        SSL_CipherPrefSetDefault(SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA, 1);
 
154
        SSL_CipherPrefSetDefault(SSL_DHE_RSA_WITH_DES_CBC_SHA, 1);
 
155
        SSL_CipherPrefSetDefault(SSL_DHE_DSS_WITH_DES_CBC_SHA, 1);
 
156
 
144
157
        _identity = PR_GetUniqueIdentity("Purple");
145
158
        _nss_methods = PR_GetDefaultIOMethods();
146
159
}
285
298
        }
286
299
        
287
300
        for (count = 0 ; count < CERT_MAX_CERT_CHAIN ; count++) {
288
 
                purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName, curcert->issuerName);
 
301
                purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName,
 
302
                                                  curcert->issuerName  ? curcert->issuerName : "(null)");
289
303
                newcrt = x509_import_from_nss(curcert);
290
304
                peer_certs = g_list_append(peer_certs, newcrt);
291
305
 
676
690
        subjectCert = X509_NSS_DATA(crt);
677
691
        g_return_val_if_fail(subjectCert, FALSE);
678
692
 
679
 
        if ( PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0 )
 
693
        if (subjectCert->issuerName == NULL
 
694
                        || PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0)
680
695
                return FALSE;
681
696
        st = CERT_VerifySignedData(&subjectCert->signatureWrap, issuerCert, PR_Now(), NULL);
682
697
        return st == SECSuccess;