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

"Overload" SunOS 4.x memcmp, which ruins ASN1_OBJECT table lookups.

Browse Source 
PR: 1196
Submitted by: Russel Ruby
This commit is contained in:
Andy Polyakov 2005-09-20 20:19:07 +00:00
parent 6f9afa68cd
commit 7a06050cd3
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crypto/asn1/tasn_enc.c
View File

@ -59,6 +59,7 @@
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include "cryptlib.h"
#include <openssl/asn1.h> #include <openssl/asn1.h>
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
#include <openssl/objects.h> #include <openssl/objects.h>

9
crypto/o_str.c
View File

@ -94,3 +94,12 @@ int OPENSSL_strcasecmp(const char *str1, const char *str2)
#endif #endif
} }
int OPENSSL_memcmp(const void *v1,const void *v2,size_t n)
{
const unsigned char *c1=v1,*c2=v2;
int ret=0;
while(n && (ret=*c1-*c2)==0) n--,c1++,c2++;
return ret;
}

1
crypto/o_str.h
View File

@ -63,5 +63,6 @@
int OPENSSL_strcasecmp(const char *str1, const char *str2); int OPENSSL_strcasecmp(const char *str1, const char *str2);
int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n); int OPENSSL_strncasecmp(const char *str1, const char *str2, size_t n);
int OPENSSL_memcmp(const void *p1,const void *p2,size_t n);
#endif #endif

3
e_os.h
View File

@ -565,6 +565,9 @@ extern HINSTANCE _hInstance;
extern char *sys_errlist[]; extern int sys_nerr; extern char *sys_errlist[]; extern int sys_nerr;
# define strerror(errnum) \ # define strerror(errnum) \
(((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum]) (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum])
/* Being signed SunOS 4.x memcpy breaks ASN1_OBJECT table lookup */
#include "o_str.h"
# define memcmp OPENSSL_memcmp
#endif #endif
#ifndef OPENSSL_EXIT #ifndef OPENSSL_EXIT