Deleted Added
sdiff udiff text old ( 238405 ) new ( 261037 )
full compact
pkcs12.c (238405) pkcs12.c (261037)
1/* pkcs12.c */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project.
4 */
5/* ====================================================================
6 * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 98 unchanged lines hidden (view full) ---

107 int export_cert = 0;
108 int options = 0;
109 int chain = 0;
110 int badarg = 0;
111 int iter = PKCS12_DEFAULT_ITER;
112 int maciter = PKCS12_DEFAULT_ITER;
113 int twopass = 0;
114 int keytype = 0;
1/* pkcs12.c */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project.
4 */
5/* ====================================================================
6 * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 98 unchanged lines hidden (view full) ---

107 int export_cert = 0;
108 int options = 0;
109 int chain = 0;
110 int badarg = 0;
111 int iter = PKCS12_DEFAULT_ITER;
112 int maciter = PKCS12_DEFAULT_ITER;
113 int twopass = 0;
114 int keytype = 0;
115 int cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
115 int cert_pbe;
116 int key_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
117 int ret = 1;
118 int macver = 1;
119 int noprompt = 0;
120 STACK_OF(OPENSSL_STRING) *canames = NULL;
121 char *cpass = NULL, *mpass = NULL;
122 char *passargin = NULL, *passargout = NULL, *passarg = NULL;
123 char *passin = NULL, *passout = NULL;
124 char *inrand = NULL;
125 char *macalg = NULL;
126 char *CApath = NULL, *CAfile = NULL;
127#ifndef OPENSSL_NO_ENGINE
128 char *engine=NULL;
129#endif
130
131 apps_startup();
132
116 int key_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
117 int ret = 1;
118 int macver = 1;
119 int noprompt = 0;
120 STACK_OF(OPENSSL_STRING) *canames = NULL;
121 char *cpass = NULL, *mpass = NULL;
122 char *passargin = NULL, *passargout = NULL, *passarg = NULL;
123 char *passin = NULL, *passout = NULL;
124 char *inrand = NULL;
125 char *macalg = NULL;
126 char *CApath = NULL, *CAfile = NULL;
127#ifndef OPENSSL_NO_ENGINE
128 char *engine=NULL;
129#endif
130
131 apps_startup();
132
133#ifdef OPENSSL_FIPS
134 if (FIPS_mode())
135 cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
136 else
137#endif
138 cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
139
133 enc = EVP_des_ede3_cbc();
134 if (bio_err == NULL ) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
135
136 if (!load_config(bio_err, NULL))
137 goto end;
138
139 args = argv + 1;
140

--- 837 unchanged lines hidden --- 		140 enc = EVP_des_ede3_cbc();
141 if (bio_err == NULL ) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
142
143 if (!load_config(bio_err, NULL))
144 goto end;
145
146 args = argv + 1;
147

--- 837 unchanged lines hidden ---