generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix windows build

Browse Source 
The big apps cleanup broke the windows build. This commit
fixes some miscellaneous issues so that it builds again.

Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Matt Caswell 2015-04-30 09:43:11 +01:00
parent fb45690275
commit a3ed492f58
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/apps.c
View File

@ -1837,7 +1837,7 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti)
n = X509_NAME_new(); n = X509_NAME_new();
if (n == NULL) if (n == NULL)
return NULL; return NULL;
work = strdup(cp); work = OPENSSL_strdup(cp);
if (work == NULL) if (work == NULL)
goto err; goto err;
@ -1894,12 +1894,12 @@ X509_NAME *parse_name(const char *cp, long chtype, int canmulti)
goto err; goto err;
} }
free(work); OPENSSL_free(work);
return n; return n;
err: err:
X509_NAME_free(n); X509_NAME_free(n);
free(work); OPENSSL_free(work);
return NULL; return NULL;
} }

8
apps/opt.c
View File

@ -54,7 +54,7 @@
#if !defined(OPENSSL_SYS_MSDOS) #if !defined(OPENSSL_SYS_MSDOS)
# include OPENSSL_UNISTD # include OPENSSL_UNISTD
#endif #endif
#include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
@ -96,11 +96,11 @@ char *opt_progname(const char *argv0)
/* Strip off trailing nonsense. */ /* Strip off trailing nonsense. */
n = strlen(p); n = strlen(p);
if (n > 4 && if (n > 4 &&
(strcmp(&p[n - 4], ".exe") == 0 || strcmp(&p[n - 4], ".EXE") == 0) (strcmp(&p[n - 4], ".exe") == 0 || strcmp(&p[n - 4], ".EXE") == 0))
n -= 4; n -= 4;
#if defined(OPENSSL_SYS_NETWARE) #if defined(OPENSSL_SYS_NETWARE)
if (n > 4 && if (n > 4 &&
(strcmp(&p[n - 4], ".nlm") == 0 || strcmp(&p[n - 4], ".NLM") == 0) (strcmp(&p[n - 4], ".nlm") == 0 || strcmp(&p[n - 4], ".NLM") == 0))
n -= 4; n -= 4;
#endif #endif
@ -108,7 +108,7 @@ char *opt_progname(const char *argv0)
if (n > sizeof prog - 1) if (n > sizeof prog - 1)
n = sizeof prog - 1; n = sizeof prog - 1;
for (q = prog, i = 0; i < n; i++, p++) for (q = prog, i = 0; i < n; i++, p++)
q++ = isupper(*p) ? tolower(*p) : *p; *q++ = isupper(*p) ? tolower(*p) : *p;
*q = '\0'; *q = '\0';
return prog; return prog;
} }