feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

add mystrnstr for buffer searching of PEM with no null terminator

Browse Source
This commit is contained in:
toddouska
2012-07-17 12:01:37 -07:00
parent d607ffaf02
commit d408f01863
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cyassl/ctaocrypt/types.h
View File

@@ -157,6 +157,8 @@ enum {
#ifndef STRING_USER #ifndef STRING_USER
#include <string.h> #include <string.h>
char* mystrnstr(const char* s1, const char* s2, unsigned int n);
#define XMEMCPY(d,s,l) memcpy((d),(s),(l)) #define XMEMCPY(d,s,l) memcpy((d),(s),(l))
#define XMEMSET(b,c,l) memset((b),(c),(l)) #define XMEMSET(b,c,l) memset((b),(c),(l))
#define XMEMCMP(s1,s2,n) memcmp((s1),(s2),(n)) #define XMEMCMP(s1,s2,n) memcmp((s1),(s2),(n))
@@ -167,6 +169,7 @@ enum {
/* strstr, strncmp, and strncat only used by CyaSSL proper, not required for /* strstr, strncmp, and strncat only used by CyaSSL proper, not required for
CTaoCrypt only */ CTaoCrypt only */
#define XSTRSTR(s1,s2) strstr((s1),(s2)) #define XSTRSTR(s1,s2) strstr((s1),(s2))
#define XSTRNSTR(s1,s2,n) mystrnstr((s1),(s2),(n))
#define XSTRNCMP(s1,s2,n) strncmp((s1),(s2),(n)) #define XSTRNCMP(s1,s2,n) strncmp((s1),(s2),(n))
#define XSTRNCAT(s1,s2,n) strncat((s1),(s2),(n)) #define XSTRNCAT(s1,s2,n) strncat((s1),(s2),(n))
#endif #endif

42
src/ssl.c
View File

@@ -77,6 +77,24 @@
#endif /* min */ #endif /* min */
char* mystrnstr(const char* s1, const char* s2, unsigned int n)
{
unsigned int s2_len = XSTRLEN(s2);
if (s2_len == 0)
return (char*)s1;
while (n >= s2_len && s1[0]) {
if (s1[0] == s2[0])
if (XMEMCMP(s1, s2, s2_len) == 0)
return (char*)s1;
s1++;
n--;
}
return NULL;
}
CYASSL_CTX* CyaSSL_CTX_new(CYASSL_METHOD* method) CYASSL_CTX* CyaSSL_CTX_new(CYASSL_METHOD* method)
{ {
@@ -719,12 +737,12 @@ int AddCA(CYASSL_CERT_MANAGER* cm, buffer der, int type, int verify)
} }
/* find header */ /* find header */
headerEnd = XSTRSTR((char*)buff, header); headerEnd = XSTRNSTR((char*)buff, header, sz);
if (!headerEnd && type == PRIVATEKEY_TYPE) { /* may be pkcs8 */ if (!headerEnd && type == PRIVATEKEY_TYPE) { /* may be pkcs8 */
XSTRNCPY(header, "-----BEGIN PRIVATE KEY-----", sizeof(header)); XSTRNCPY(header, "-----BEGIN PRIVATE KEY-----", sizeof(header));
XSTRNCPY(footer, "-----END PRIVATE KEY-----", sizeof(footer)); XSTRNCPY(footer, "-----END PRIVATE KEY-----", sizeof(footer));
headerEnd = XSTRSTR((char*)buff, header); headerEnd = XSTRNSTR((char*)buff, header, sz);
if (headerEnd) if (headerEnd)
pkcs8 = 1; pkcs8 = 1;
else { else {
@@ -733,7 +751,7 @@ int AddCA(CYASSL_CERT_MANAGER* cm, buffer der, int type, int verify)
XSTRNCPY(footer, "-----END ENCRYPTED PRIVATE KEY-----", XSTRNCPY(footer, "-----END ENCRYPTED PRIVATE KEY-----",
sizeof(footer)); sizeof(footer));
headerEnd = XSTRSTR((char*)buff, header); headerEnd = XSTRNSTR((char*)buff, header, sz);
if (headerEnd) if (headerEnd)
pkcs8Enc = 1; pkcs8Enc = 1;
} }
@@ -742,7 +760,7 @@ int AddCA(CYASSL_CERT_MANAGER* cm, buffer der, int type, int verify)
XSTRNCPY(header, "-----BEGIN EC PRIVATE KEY-----", sizeof(header)); XSTRNCPY(header, "-----BEGIN EC PRIVATE KEY-----", sizeof(header));
XSTRNCPY(footer, "-----END EC PRIVATE KEY-----", sizeof(footer)); XSTRNCPY(footer, "-----END EC PRIVATE KEY-----", sizeof(footer));
headerEnd = XSTRSTR((char*)buff, header); headerEnd = XSTRNSTR((char*)buff, header, sz);
if (headerEnd) if (headerEnd)
*eccKey = 1; *eccKey = 1;
} }
@@ -750,7 +768,7 @@ int AddCA(CYASSL_CERT_MANAGER* cm, buffer der, int type, int verify)
XSTRNCPY(header, "-----BEGIN DSA PRIVATE KEY-----", sizeof(header)); XSTRNCPY(header, "-----BEGIN DSA PRIVATE KEY-----", sizeof(header));
XSTRNCPY(footer, "-----END DSA PRIVATE KEY-----", sizeof(footer)); XSTRNCPY(footer, "-----END DSA PRIVATE KEY-----", sizeof(footer));
headerEnd = XSTRSTR((char*)buff, header); headerEnd = XSTRNSTR((char*)buff, header, sz);
} }
if (!headerEnd) if (!headerEnd)
return SSL_BAD_FILE; return SSL_BAD_FILE;
@@ -768,28 +786,28 @@ int AddCA(CYASSL_CERT_MANAGER* cm, buffer der, int type, int verify)
{ {
/* remove encrypted header if there */ /* remove encrypted header if there */
char encHeader[] = "Proc-Type"; char encHeader[] = "Proc-Type";
char* line = XSTRSTR((char*)buff, encHeader); char* line = XSTRNSTR((char*)buff, encHeader, PEM_LINE_LEN);
if (line) { if (line) {
char* newline; char* newline;
char* finish; char* finish;
char* start = XSTRSTR(line, "DES"); char* start = XSTRNSTR(line, "DES", PEM_LINE_LEN);
if (!start) if (!start)
start = XSTRSTR(line, "AES"); start = XSTRNSTR(line, "AES", PEM_LINE_LEN);
if (!start) return SSL_BAD_FILE; if (!start) return SSL_BAD_FILE;
if (!info) return SSL_BAD_FILE; if (!info) return SSL_BAD_FILE;
finish = XSTRSTR(start, ","); finish = XSTRNSTR(start, ",", PEM_LINE_LEN);
if (start && finish && (start < finish)) { if (start && finish && (start < finish)) {
newline = XSTRSTR(finish, "\r"); newline = XSTRNSTR(finish, "\r", PEM_LINE_LEN);
XMEMCPY(info->name, start, finish - start); XMEMCPY(info->name, start, finish - start);
info->name[finish - start] = 0; info->name[finish - start] = 0;
XMEMCPY(info->iv, finish + 1, sizeof(info->iv)); XMEMCPY(info->iv, finish + 1, sizeof(info->iv));
if (!newline) newline = XSTRSTR(finish, "\n"); if (!newline) newline = XSTRNSTR(finish, "\n", PEM_LINE_LEN);
if (newline && (newline > finish)) { if (newline && (newline > finish)) {
info->ivSz = (word32)(newline - (finish + 1)); info->ivSz = (word32)(newline - (finish + 1));
info->set = 1; info->set = 1;
@@ -809,7 +827,7 @@ int AddCA(CYASSL_CERT_MANAGER* cm, buffer der, int type, int verify)
#endif /* OPENSSL_EXTRA || HAVE_WEBSERVER */ #endif /* OPENSSL_EXTRA || HAVE_WEBSERVER */
/* find footer */ /* find footer */
footerEnd = XSTRSTR((char*)buff, footer); footerEnd = XSTRNSTR((char*)buff, footer, sz);
if (!footerEnd) return SSL_BAD_FILE; if (!footerEnd) return SSL_BAD_FILE;
consumedEnd = footerEnd + XSTRLEN(footer); consumedEnd = footerEnd + XSTRLEN(footer);