diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-23 20:17:10 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-23 20:17:10 +0000 |
| commit | 1b639dab951fb73d5031aa0c1afb13e8480d1dae (patch) | |
| tree | 4e13a4d1e4c609bd01d0bf5d65c6a8acdc3d0c50 /openssl/apps/enc.c | |
| parent | 51181fb7f4d135d214974bb6611d51f21475eec8 (diff) | |
| parent | b680cf39ed5bc37e0eb7eb86ad8599bf92df3f2b (diff) | |
| download | vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.tar.gz vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.tar.bz2 vcxsrv-1b639dab951fb73d5031aa0c1afb13e8480d1dae.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'openssl/apps/enc.c')
| -rw-r--r-- | openssl/apps/enc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/openssl/apps/enc.c b/openssl/apps/enc.c index 3c2c91e92..c28d8b194 100644 --- a/openssl/apps/enc.c +++ b/openssl/apps/enc.c @@ -101,9 +101,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif static const char magic[]="Salted__"; char mbuf[sizeof magic-1]; char *strbuf=NULL; @@ -328,7 +325,7 @@ bad: } #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif if (md && (dgst=EVP_get_digestbyname(md)) == NULL) |