diff options
| author | Richard Levitte <levitte@openssl.org> | 2015-05-29 08:07:10 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2015-05-29 12:41:50 +0200 |
| commit | 296f54ee211edbf8d21479091b4c20a9ee7698ad (patch) | |
| tree | 4f746de806c85723368d65c4ab36d8e34974b214 /apps/pkcs8.c | |
| parent | 21425195009e4daf6971453f8a0be08375ae9eec (diff) | |
| download | openssl-new-296f54ee211edbf8d21479091b4c20a9ee7698ad.tar.gz | |
Restore module loading
The module loading feature got broken a while ago, so restore it, but
have it a bit more explicit this time around.
Reviewed-by: Stephen Henson <steve@openssl.org>
Diffstat (limited to 'apps/pkcs8.c')
| -rw-r--r-- | apps/pkcs8.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/pkcs8.c b/apps/pkcs8.c index b4af160035..f8a340edaf 100644 --- a/apps/pkcs8.c +++ b/apps/pkcs8.c @@ -223,6 +223,9 @@ int pkcs8_main(int argc, char **argv) goto end; } + if (!app_load_modules(NULL)) + goto end; + if ((pbe_nid == -1) && !cipher) pbe_nid = NID_pbeWithMD5AndDES_CBC; |