← Back to branch summary

~ubuntu-branches/ubuntu/karmic/openssl/karmic-proposed

« back to all changes in this revision

Viewing changes to apps/pkcs12.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-12-05 00:13:39 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20071205001339-tazlol313zs8u6ec
Tags: 0.9.8g-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure: Add support for lpia.
  - Replace duplicate files in the doc directory with symlinks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/pkcs12.c
153
153
                        cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
154
154
                else if (!strcmp (*args, "-export")) export_cert = 1;
155
155
                else if (!strcmp (*args, "-des")) enc=EVP_des_cbc();
 
156
                else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
156
157
#ifndef OPENSSL_NO_IDEA
157
158
                else if (!strcmp (*args, "-idea")) enc=EVP_idea_cbc();
158
159
#endif
159
 
                else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
 
160
#ifndef OPENSSL_NO_SEED
 
161
                else if (!strcmp(*args, "-seed")) enc=EVP_seed_cbc();
 
162
#endif
160
163
#ifndef OPENSSL_NO_AES
161
164
                else if (!strcmp(*args,"-aes128")) enc=EVP_aes_128_cbc();
162
165
                else if (!strcmp(*args,"-aes192")) enc=EVP_aes_192_cbc();
306
309
#ifndef OPENSSL_NO_IDEA
307
310
        BIO_printf (bio_err, "-idea         encrypt private keys with idea\n");
308
311
#endif
 
312
#ifndef OPENSSL_NO_SEED
 
313
        BIO_printf (bio_err, "-seed         encrypt private keys with seed\n");
 
314
#endif
309
315
#ifndef OPENSSL_NO_AES
310
316
        BIO_printf (bio_err, "-aes128, -aes192, -aes256\n");
311
317
        BIO_printf (bio_err, "              encrypt PEM output with cbc aes\n");
471
477
                                        X509_keyid_set1(ucert, NULL, 0);
472
478
                                        X509_alias_set1(ucert, NULL, 0);
473
479
                                        /* Remove from list */
474
 
                                        sk_X509_delete(certs, i);
 
480
                                        (void)sk_X509_delete(certs, i);
475
481
                                        break;
476
482
                                        }
477
483
                                }