← Back to branch summary

~helen-fornazier/shim/trunk

« back to all changes in this revision

Viewing changes to Cryptlib/OpenSSL/crypto/pem/pem_info.c

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2016-09-22 00:29:42 UTC
  • mto: This revision was merged to the branch mainline in revision 107.
  • Revision ID: mathieu.trudel-lapierre@canonical.com-20160922002942-volexao40gxxs0qs
Tags: upstream-0.9+1474479173.6c180c6
Import upstream version 0.9+1474479173.6c180c6

Show diffs side-by-side

added added

removed removed

Lines of Context:
Cryptlib/OpenSSL/crypto/pem/pem_info.c
172
172
            xi->enc_len = 0;
173
173
 
174
174
            xi->x_pkey = X509_PKEY_new();
 
175
            if (xi->x_pkey == NULL)
 
176
                goto err;
175
177
            ptype = EVP_PKEY_RSA;
176
178
            pp = &xi->x_pkey->dec_pkey;
177
179
            if ((int)strlen(header) > 10) /* assume encrypted */
193
195
            xi->enc_len = 0;
194
196
 
195
197
            xi->x_pkey = X509_PKEY_new();
 
198
            if (xi->x_pkey == NULL)
 
199
                goto err;
196
200
            ptype = EVP_PKEY_DSA;
197
201
            pp = &xi->x_pkey->dec_pkey;
198
202
            if ((int)strlen(header) > 10) /* assume encrypted */
214
218
            xi->enc_len = 0;
215
219
 
216
220
            xi->x_pkey = X509_PKEY_new();
 
221
            if (xi->x_pkey == NULL)
 
222
                goto err;
217
223
            ptype = EVP_PKEY_EC;
218
224
            pp = &xi->x_pkey->dec_pkey;
219
225
            if ((int)strlen(header) > 10) /* assume encrypted */