diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2002-03-06 14:15:13 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2002-03-06 14:15:13 +0000 |
| commit | 0dc092334bc785b6fb0c8b568acba3db665b7e22 (patch) | |
| tree | 840b102627a53bead4f8e80f34a81f6c1610d05e /apps | |
| parent | 36c194638e86cd46d5da2b3efbe9ae5354e19096 (diff) | |
| download | openssl-0dc092334bc785b6fb0c8b568acba3db665b7e22.tar.gz | |
ENGINE module additions.
Add "init" command to control ENGINE
initialization.
Call ENGINE_finish on initialized ENGINEs on exit.
Reorder shutdown in apps.c: modules should be shut
down first.
Add test private key loader to openssl ENGINE: this
just loads a private key in PEM format.
Fix print format for dh length parameter.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.h | 8 | ||||
| -rw-r--r-- | apps/dhparam.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/apps.h b/apps/apps.h index 24aa447117..a05ba712be 100644 --- a/apps/apps.h +++ b/apps/apps.h @@ -195,10 +195,10 @@ extern BIO *bio_err; setup_ui_method(); } while(0) # endif # define apps_shutdown() \ - do { destroy_ui_method(); EVP_cleanup(); \ - ENGINE_cleanup(); CRYPTO_cleanup_all_ex_data(); \ - ERR_remove_state(0); ERR_free_strings(); \ - CONF_modules_unload(1); } while(0) + do { CONF_modules_unload(1); destroy_ui_method(); \ + EVP_cleanup(); ENGINE_cleanup(); \ + CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \ + ERR_free_strings(); } while(0) #endif typedef struct args_st diff --git a/apps/dhparam.c b/apps/dhparam.c index f1664a59b7..ea15ef3236 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -490,7 +490,7 @@ bad: printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n"); printf("\t\t{ DH_free(dh); return(NULL); }\n"); if (dh->length) - printf("\tdh->length = %d;\n", dh->length); + printf("\tdh->length = %ld;\n", dh->length); printf("\treturn(dh);\n\t}\n"); OPENSSL_free(data); } |