projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for Win32 build.
[openssl.git]
/
crypto
/
asn1
/
f_string.c
diff --git
a/crypto/asn1/f_string.c
b/crypto/asn1/f_string.c
index 9bcc5a93c9dc82161f42724aae17640db4a3ffff..968698a79887744ac35c194f78b0c09071cddf00 100644
(file)
--- a/
crypto/asn1/f_string.c
+++ b/
crypto/asn1/f_string.c
@@
-59,7
+59,7
@@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/buffer.h>
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/buffer.h>
-#include <openssl/
x509
.h>
+#include <openssl/
asn1
.h>
int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
{
int i2a_ASN1_STRING(BIO *bp, ASN1_STRING *a, int type)
{
@@
-123,9
+123,18
@@
int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
for (j=i-1; j>0; j--)
{
for (j=i-1; j>0; j--)
{
+#ifndef CHARSET_EBCDIC
if (!( ((buf[j] >= '0') && (buf[j] <= '9')) ||
((buf[j] >= 'a') && (buf[j] <= 'f')) ||
((buf[j] >= 'A') && (buf[j] <= 'F'))))
if (!( ((buf[j] >= '0') && (buf[j] <= '9')) ||
((buf[j] >= 'a') && (buf[j] <= 'f')) ||
((buf[j] >= 'A') && (buf[j] <= 'F'))))
+#else
+ /* This #ifdef is not strictly necessary, since
+ * the characters A...F a...f 0...9 are contiguous
+ * (yes, even in EBCDIC - but not the whole alphabet).
+ * Nevertheless, isxdigit() is faster.
+ */
+ if (!isxdigit(buf[j]))
+#endif
{
i=j;
break;
{
i=j;
break;
@@
-149,15
+158,15
@@
int a2i_ASN1_STRING(BIO *bp, ASN1_STRING *bs, char *buf, int size)
if (num+i > slen)
{
if (s == NULL)
if (num+i > slen)
{
if (s == NULL)
- sp=(unsigned char *)
M
alloc(
+ sp=(unsigned char *)
OPENSSL_m
alloc(
(unsigned int)num+i*2);
else
(unsigned int)num+i*2);
else
- sp=(unsigned char *)
R
ealloc(s,
+ sp=(unsigned char *)
OPENSSL_r
ealloc(s,
(unsigned int)num+i*2);
if (sp == NULL)
{
ASN1err(ASN1_F_A2I_ASN1_STRING,ERR_R_MALLOC_FAILURE);
(unsigned int)num+i*2);
if (sp == NULL)
{
ASN1err(ASN1_F_A2I_ASN1_STRING,ERR_R_MALLOC_FAILURE);
- if (s != NULL)
Free((char *)
s);
+ if (s != NULL)
OPENSSL_free(
s);
goto err;
}
s=sp;
goto err;
}
s=sp;