srp.c (1.1.1.6) | srp.c (1.1.1.7) |
---|---|
1/* apps/srp.c */ 2/* 3 * Written by Peter Sylvester (peter.sylvester@edelweb.fr) for the EdelKey 4 * project and contributed to the OpenSSL project 2004. 5 */ 6/* ==================================================================== 7 * Copyright (c) 2004 The OpenSSL Project. All rights reserved. 8 * --- 279 unchanged lines hidden (view full) --- 288 int doupdatedb = 0; 289 char *configfile = NULL; 290 char *dbfile = NULL; 291 CA_DB *db = NULL; 292 char **pp; 293 int i; 294 long errorline = -1; 295 char *randfile = NULL; | 1/* apps/srp.c */ 2/* 3 * Written by Peter Sylvester (peter.sylvester@edelweb.fr) for the EdelKey 4 * project and contributed to the OpenSSL project 2004. 5 */ 6/* ==================================================================== 7 * Copyright (c) 2004 The OpenSSL Project. All rights reserved. 8 * --- 279 unchanged lines hidden (view full) --- 288 int doupdatedb = 0; 289 char *configfile = NULL; 290 char *dbfile = NULL; 291 CA_DB *db = NULL; 292 char **pp; 293 int i; 294 long errorline = -1; 295 char *randfile = NULL; |
296# ifndef OPENSSL_NO_ENGINE | 296 ENGINE *e = NULL; |
297 char *engine = NULL; | 297 char *engine = NULL; |
298# endif | |
299 char *tofree = NULL; 300 DB_ATTR db_attr; 301 302# ifdef EFENCE 303 EF_PROTECT_FREE = 1; 304 EF_PROTECT_BELOW = 1; 305 EF_ALIGNMENT = 0; 306# endif --- 99 unchanged lines hidden (view full) --- 406 BIO_printf(bio_err, 407 " load the file (or the files in the directory) into\n"); 408 BIO_printf(bio_err, " the random number generator\n"); 409 goto err; 410 } 411 412 ERR_load_crypto_strings(); 413 | 298 char *tofree = NULL; 299 DB_ATTR db_attr; 300 301# ifdef EFENCE 302 EF_PROTECT_FREE = 1; 303 EF_PROTECT_BELOW = 1; 304 EF_ALIGNMENT = 0; 305# endif --- 99 unchanged lines hidden (view full) --- 405 BIO_printf(bio_err, 406 " load the file (or the files in the directory) into\n"); 407 BIO_printf(bio_err, " the random number generator\n"); 408 goto err; 409 } 410 411 ERR_load_crypto_strings(); 412 |
414# ifndef OPENSSL_NO_ENGINE 415 setup_engine(bio_err, engine, 0); 416# endif | 413 e = setup_engine(bio_err, engine, 0); |
417 418 if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) { 419 BIO_printf(bio_err, "Error getting passwords\n"); 420 goto err; 421 } 422 423 if (!dbfile) { 424 --- 330 unchanged lines hidden (view full) --- 755 ERR_print_errors(bio_err); 756 if (randfile) 757 app_RAND_write_file(randfile, bio_err); 758 if (conf) 759 NCONF_free(conf); 760 if (db) 761 free_index(db); 762 | 414 415 if (!app_passwd(bio_err, passargin, passargout, &passin, &passout)) { 416 BIO_printf(bio_err, "Error getting passwords\n"); 417 goto err; 418 } 419 420 if (!dbfile) { 421 --- 330 unchanged lines hidden (view full) --- 752 ERR_print_errors(bio_err); 753 if (randfile) 754 app_RAND_write_file(randfile, bio_err); 755 if (conf) 756 NCONF_free(conf); 757 if (db) 758 free_index(db); 759 |
760 release_engine(e); |
|
763 OBJ_cleanup(); 764 apps_shutdown(); 765 OPENSSL_EXIT(ret); 766} 767 768#else 769static void *dummy = &dummy; 770#endif | 761 OBJ_cleanup(); 762 apps_shutdown(); 763 OPENSSL_EXIT(ret); 764} 765 766#else 767static void *dummy = &dummy; 768#endif |