← Back to branch summary

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

« back to all changes in this revision

Viewing changes to crypto/pkcs12/pk12err.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/pkcs12/pk12err.c
133
133
 
134
134
void ERR_load_PKCS12_strings(void)
135
135
        {
136
 
        static int init=1;
 
136
#ifndef OPENSSL_NO_ERR
137
137
 
138
 
        if (init)
 
138
        if (ERR_func_error_string(PKCS12_str_functs[0].error) == NULL)
139
139
                {
140
 
                init=0;
141
 
#ifndef OPENSSL_NO_ERR
142
140
                ERR_load_strings(0,PKCS12_str_functs);
143
141
                ERR_load_strings(0,PKCS12_str_reasons);
144
 
#endif
145
 
 
146
142
                }
 
143
#endif
147
144
        }