projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
constify X509_ALGOR_get0()
[openssl.git]
/
apps
/
openssl.c
diff --git
a/apps/openssl.c
b/apps/openssl.c
index 978790e04b8da95027cdf01a1d355fb0be041ab3..0f7176fd723e27e359063eee197f61b77d7ec81d 100644
(file)
--- a/
apps/openssl.c
+++ b/
apps/openssl.c
@@
-12,7
+12,6
@@
#include <stdlib.h>
#include <openssl/bio.h>
#include <openssl/crypto.h>
#include <stdlib.h>
#include <openssl/bio.h>
#include <openssl/crypto.h>
-#include <openssl/rand.h>
#include <openssl/lhash.h>
#include <openssl/conf.h>
#include <openssl/x509.h>
#include <openssl/lhash.h>
#include <openssl/conf.h>
#include <openssl/x509.h>
@@
-132,6
+131,11
@@
int main(int argc, char *argv[])
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
copied_argv = argv = copy_argv(&argc, argv);
#if defined(OPENSSL_SYS_VMS) && defined(__DECC)
copied_argv = argv = copy_argv(&argc, argv);
+#elif defined(_WIN32)
+ /*
+ * Replace argv[] with UTF-8 encoded strings.
+ */
+ win32_utf8argv(&argc, &argv);
#endif
p = getenv("OPENSSL_DEBUG_MEMORY");
#endif
p = getenv("OPENSSL_DEBUG_MEMORY");
@@
-204,7
+208,7
@@
int main(int argc, char *argv[])
extern void add_history(const char *cp);
char *text;
extern void add_history(const char *cp);
char *text;
-
char *
text = readline(prompt);
+ text = readline(prompt);
if (text == NULL)
goto end;
i = strlen(text);
if (text == NULL)
goto end;
i = strlen(text);
@@
-525,7
+529,7
@@
static int function_cmp(const FUNCTION * a, const FUNCTION * b)
static unsigned long function_hash(const FUNCTION * a)
{
static unsigned long function_hash(const FUNCTION * a)
{
- return
lh
_strhash(a->name);
+ return
OPENSSL_LH
_strhash(a->name);
}
static int SortFnByName(const void *_f1, const void *_f2)
}
static int SortFnByName(const void *_f1, const void *_f2)