projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: return 0 if no error occured.
[oweals/openssl.git]
/
apps
/
apps.c
diff --git
a/apps/apps.c
b/apps/apps.c
index ddc4df077343c02baf65d06bf9fa3de057e2d72e..c2633b21e2247959c06797cbadc043a3a1786654 100644
(file)
--- a/
apps/apps.c
+++ b/
apps/apps.c
@@
-70,7
+70,13
@@
#include <openssl/pkcs12.h>
#include <openssl/safestack.h>
#include <openssl/pkcs12.h>
#include <openssl/safestack.h>
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
+#define strcasecmp _stricmp
+#else
+#include <strings.h>
+#endif
+
+#ifdef OPENSSL_SYS_WINDOWS
# include "bss_file.c"
#endif
# include "bss_file.c"
#endif
@@
-184,7
+190,7
@@
int str2fmt(char *s)
return(FORMAT_UNDEF);
}
return(FORMAT_UNDEF);
}
-#if defined(
MSDOS) || defined(WIN32) || defined(
WIN16)
+#if defined(
OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_
WIN16)
void program_name(char *in, char *out, int size)
{
int i,n;
void program_name(char *in, char *out, int size)
{
int i,n;
@@
-222,7
+228,7
@@
void program_name(char *in, char *out, int size)
out[n]='\0';
}
#else
out[n]='\0';
}
#else
-#ifdef VMS
+#ifdef
OPENSSL_SYS_
VMS
void program_name(char *in, char *out, int size)
{
char *p=in, *q;
void program_name(char *in, char *out, int size)
{
char *p=in, *q;
@@
-258,10
+264,10
@@
void program_name(char *in, char *out, int size)
#endif
#endif
#endif
#endif
-#ifdef WIN32
+#ifdef
OPENSSL_SYS_
WIN32
int WIN32_rename(char *from, char *to)
{
int WIN32_rename(char *from, char *to)
{
-#ifdef WINNT
+#ifdef
OPENSSL_SYS_
WINNT
int ret;
/* Note: MoveFileEx() doesn't work under Win95, Win98 */
int ret;
/* Note: MoveFileEx() doesn't work under Win95, Win98 */
@@
-476,7
+482,10
@@
X509 *load_cert(BIO *err, char *file, int format)
}
if (file == NULL)
}
if (file == NULL)
+ {
+ setvbuf(stdin, NULL, _IONBF, 0);
BIO_set_fp(cert,stdin,BIO_NOCLOSE);
BIO_set_fp(cert,stdin,BIO_NOCLOSE);
+ }
else
{
if (BIO_read_filename(cert,file) <= 0)
else
{
if (BIO_read_filename(cert,file) <= 0)