← Back to branch summary

~ubuntu-branches/ubuntu/hardy/openssl/hardy-security

« back to all changes in this revision

Viewing changes to crypto/x509/by_dir.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2005-12-13 21:37:42 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051213213742-7em5nrw5c7ceegyd
Tags: 0.9.8a-5
http://bugs.debian.org/335912
Stop ssh from crashing randomly on sparc (Closes: #335912)
Patch from upstream cvs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/x509/by_dir.c
114
114
        {
115
115
        int ret=0;
116
116
        BY_DIR *ld;
117
 
        char *dir;
 
117
        char *dir = NULL;
118
118
 
119
119
        ld=(BY_DIR *)ctx->method_data;
120
120
 
123
123
        case X509_L_ADD_DIR:
124
124
                if (argl == X509_FILETYPE_DEFAULT)
125
125
                        {
126
 
                        ret=add_cert_dir(ld,X509_get_default_cert_dir(),
127
 
                                X509_FILETYPE_PEM);
 
126
                        dir=(char *)Getenv(X509_get_default_cert_dir_env());
 
127
                        if (dir)
 
128
                                ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);
 
129
                        else
 
130
                                ret=add_cert_dir(ld,X509_get_default_cert_dir(),
 
131
                                        X509_FILETYPE_PEM);
128
132
                        if (!ret)
129
133
                                {
130
134
                                X509err(X509_F_DIR_CTRL,X509_R_LOADING_CERT_DIR);
131
135
                                }
132
 
                        else
133
 
                                {
134
 
                                dir=(char *)Getenv(X509_get_default_cert_dir_env());
135
 
                                ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);
136
 
                                }
137
136
                        }
138
137
                else
139
138
                        ret=add_cert_dir(ld,argp,(int)argl);