aboutsummaryrefslogtreecommitdiff
path: root/openssl/apps
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-27 20:31:28 +0100
committermarha <marha@users.sourceforge.net>2012-01-27 20:31:28 +0100
commitc6a1477b0092762299491d79b3a8cb094c6456da (patch)
tree8458d152a6d4cecd8b2d88f3e7e6950128a53fb7 /openssl/apps
parenteb4c088eb71f93b9639f4ff651523d794f1433f7 (diff)
downloadvcxsrv-c6a1477b0092762299491d79b3a8cb094c6456da.tar.gz
vcxsrv-c6a1477b0092762299491d79b3a8cb094c6456da.tar.bz2
vcxsrv-c6a1477b0092762299491d79b3a8cb094c6456da.zip
update to openssl 1.0.0g
Diffstat (limited to 'openssl/apps')
-rw-r--r--openssl/apps/ca.c2
-rw-r--r--openssl/apps/cms.c2
-rw-r--r--openssl/apps/openssl-vms.cnf2
-rw-r--r--openssl/apps/openssl.cnf2
-rw-r--r--openssl/apps/s_client.c2
-rw-r--r--openssl/apps/s_server.c2
-rw-r--r--openssl/apps/x509.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/openssl/apps/ca.c b/openssl/apps/ca.c
index 6b8b0ef8f..5d11948bb 100644
--- a/openssl/apps/ca.c
+++ b/openssl/apps/ca.c
@@ -2536,7 +2536,7 @@ static int get_certificate_status(const char *serial, CA_DB *db)
/* Make it Upper Case */
for (i=0; row[DB_serial][i] != '\0'; i++)
- row[DB_serial][i] = toupper(row[DB_serial][i]);
+ row[DB_serial][i] = toupper((unsigned char)row[DB_serial][i]);
ok=1;
diff --git a/openssl/apps/cms.c b/openssl/apps/cms.c
index d29a88490..d15925a59 100644
--- a/openssl/apps/cms.c
+++ b/openssl/apps/cms.c
@@ -618,7 +618,7 @@ int MAIN(int argc, char **argv)
BIO_printf (bio_err, "-certsout file certificate output file\n");
BIO_printf (bio_err, "-signer file signer certificate file\n");
BIO_printf (bio_err, "-recip file recipient certificate file for decryption\n");
- BIO_printf (bio_err, "-skeyid use subject key identifier\n");
+ BIO_printf (bio_err, "-keyid use subject key identifier\n");
BIO_printf (bio_err, "-in file input file\n");
BIO_printf (bio_err, "-inform arg input format SMIME (default), PEM or DER\n");
BIO_printf (bio_err, "-inkey file input private key (if not signer or recipient)\n");
diff --git a/openssl/apps/openssl-vms.cnf b/openssl/apps/openssl-vms.cnf
index 20ed61bc3..45e46a0fb 100644
--- a/openssl/apps/openssl-vms.cnf
+++ b/openssl/apps/openssl-vms.cnf
@@ -145,7 +145,7 @@ localityName = Locality Name (eg, city)
organizationalUnitName = Organizational Unit Name (eg, section)
#organizationalUnitName_default =
-commonName = Common Name (eg, YOUR name)
+commonName = Common Name (e.g. server FQDN or YOUR name)
commonName_max = 64
emailAddress = Email Address
diff --git a/openssl/apps/openssl.cnf b/openssl/apps/openssl.cnf
index 9d2cd5bfa..18760c6e6 100644
--- a/openssl/apps/openssl.cnf
+++ b/openssl/apps/openssl.cnf
@@ -145,7 +145,7 @@ localityName = Locality Name (eg, city)
organizationalUnitName = Organizational Unit Name (eg, section)
#organizationalUnitName_default =
-commonName = Common Name (eg, YOUR name)
+commonName = Common Name (e.g. server FQDN or YOUR name)
commonName_max = 64
emailAddress = Email Address
diff --git a/openssl/apps/s_client.c b/openssl/apps/s_client.c
index 34ad2cec7..53be0f8f8 100644
--- a/openssl/apps/s_client.c
+++ b/openssl/apps/s_client.c
@@ -581,7 +581,7 @@ int MAIN(int argc, char **argv)
psk_key=*(++argv);
for (j = 0; j < strlen(psk_key); j++)
{
- if (isxdigit((int)psk_key[j]))
+ if (isxdigit((unsigned char)psk_key[j]))
continue;
BIO_printf(bio_err,"Not a hex number '%s'\n",*argv);
goto bad;
diff --git a/openssl/apps/s_server.c b/openssl/apps/s_server.c
index 8a0c34cf0..a3a04d473 100644
--- a/openssl/apps/s_server.c
+++ b/openssl/apps/s_server.c
@@ -1103,7 +1103,7 @@ int MAIN(int argc, char *argv[])
psk_key=*(++argv);
for (i=0; i<strlen(psk_key); i++)
{
- if (isxdigit((int)psk_key[i]))
+ if (isxdigit((unsigned char)psk_key[i]))
continue;
BIO_printf(bio_err,"Not a hex number '%s'\n",*argv);
goto bad;
diff --git a/openssl/apps/x509.c b/openssl/apps/x509.c
index ed1e8c69a..9f5eaeb6b 100644
--- a/openssl/apps/x509.c
+++ b/openssl/apps/x509.c
@@ -987,7 +987,7 @@ bad:
else
{
pk=load_key(bio_err,
- keyfile, FORMAT_PEM, 0,
+ keyfile, keyformat, 0,
passin, e, "request key");
if (pk == NULL) goto end;
}