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

remove null terminators on substrings

Browse Source
This commit is contained in:
Jacob Barthelmeh
2019-02-20 16:39:18 -07:00
parent 9c9221432f
commit 18d3e04dbf
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/ssl.c
View File

@ -16868,12 +16868,12 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
} }
if (wolfSSL_BIO_write(bio, "Certificate:\n", if (wolfSSL_BIO_write(bio, "Certificate:\n",
sizeof("Certificate:\n")) <= 0) { (int)XSTRLEN("Certificate:\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, " Data:\n", if (wolfSSL_BIO_write(bio, " Data:\n",
sizeof(" Data:\n")) <= 0) { (int)XSTRLEN(" Data:\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -16887,7 +16887,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, " Version: ", if (wolfSSL_BIO_write(bio, " Version: ",
sizeof(" Version: ")) <= 0) { (int)XSTRLEN(" Version: ")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
XSNPRINTF(tmp, sizeof(tmp), "%d\n", version); XSNPRINTF(tmp, sizeof(tmp), "%d\n", version);
@ -16908,7 +16908,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, " Serial Number: ", if (wolfSSL_BIO_write(bio, " Serial Number: ",
sizeof(" Serial Number: ")) <= 0) { (int)XSTRLEN(" Serial Number: ")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -16929,7 +16929,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
/* serial is larger than int size so print off hex values */ /* serial is larger than int size so print off hex values */
if (wolfSSL_BIO_write(bio, "\n ", if (wolfSSL_BIO_write(bio, "\n ",
sizeof("\n ")) <= 0) { (int)XSTRLEN("\n ")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
tmp[0] = '\0'; tmp[0] = '\0';
@ -16957,14 +16957,14 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, " Signature Algorithm: ", if (wolfSSL_BIO_write(bio, " Signature Algorithm: ",
sizeof(" Signature Algorithm: ")) <= 0) { XSTRLEN(" Signature Algorithm: ")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
sig = GetSigName(oid); sig = GetSigName(oid);
if (wolfSSL_BIO_write(bio, sig, (int)XSTRLEN(sig)) <= 0) { if (wolfSSL_BIO_write(bio, sig, (int)XSTRLEN(sig)) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, "\n", sizeof("\n")) <= 0) { if (wolfSSL_BIO_write(bio, "\n", (int)XSTRLEN("\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
} }
@ -16984,7 +16984,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
wolfSSL_X509_get_issuer_name(x509), buff, issSz); wolfSSL_X509_get_issuer_name(x509), buff, issSz);
if (wolfSSL_BIO_write(bio, " Issuer: ", if (wolfSSL_BIO_write(bio, " Issuer: ",
sizeof(" Issuer: ")) <= 0) { (int)XSTRLEN(" Issuer: ")) <= 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(issuer, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(issuer, NULL, DYNAMIC_TYPE_OPENSSL);
#endif #endif
@ -17001,7 +17001,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(issuer, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(issuer, NULL, DYNAMIC_TYPE_OPENSSL);
#endif #endif
if (wolfSSL_BIO_write(bio, "\n", sizeof("\n")) <= 0) { if (wolfSSL_BIO_write(bio, "\n", (int)XSTRLEN("\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
} }
@ -17011,11 +17011,11 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
char tmp[80]; char tmp[80];
if (wolfSSL_BIO_write(bio, " Validity\n", if (wolfSSL_BIO_write(bio, " Validity\n",
sizeof(" Validity\n")) <= 0) { (int)XSTRLEN(" Validity\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, " Not Before: ", if (wolfSSL_BIO_write(bio, " Not Before: ",
sizeof(" Not Before: ")) <= 0) { (int)XSTRLEN(" Not Before: ")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (GetTimeString(x509->notBefore + 2, ASN_UTC_TIME, if (GetTimeString(x509->notBefore + 2, ASN_UTC_TIME,
@ -17031,7 +17031,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wolfSSL_BIO_write(bio, "\n Not After : ", if (wolfSSL_BIO_write(bio, "\n Not After : ",
sizeof("\n Not After : ")) <= 0) { (int)XSTRLEN("\n Not After : ")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (GetTimeString(x509->notAfter + 2,ASN_UTC_TIME, if (GetTimeString(x509->notAfter + 2,ASN_UTC_TIME,
@ -17063,7 +17063,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
wolfSSL_X509_get_subject_name(x509), buff, subSz); wolfSSL_X509_get_subject_name(x509), buff, subSz);
if (wolfSSL_BIO_write(bio, "\n Subject: ", if (wolfSSL_BIO_write(bio, "\n Subject: ",
sizeof("\n Subject: ")) <= 0) { (int)XSTRLEN("\n Subject: ")) <= 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(subject, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(subject, NULL, DYNAMIC_TYPE_OPENSSL);
#endif #endif
@ -17084,7 +17084,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
/* get and print public key */ /* get and print public key */
if (wolfSSL_BIO_write(bio, "\n Subject Public Key Info:\n", if (wolfSSL_BIO_write(bio, "\n Subject Public Key Info:\n",
sizeof("\n Subject Public Key Info:\n")) <= 0) { (int)XSTRLEN("\n Subject Public Key Info:\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
{ {
@ -17095,13 +17095,13 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
case RSAk: case RSAk:
if (wolfSSL_BIO_write(bio, if (wolfSSL_BIO_write(bio,
" Public Key Algorithm: RSA\n", " Public Key Algorithm: RSA\n",
sizeof(" Public Key Algorithm: RSA\n")) <= 0) { (int)XSTRLEN(" Public Key Algorithm: RSA\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
#ifdef HAVE_USER_RSA #ifdef HAVE_USER_RSA
if (wolfSSL_BIO_write(bio, if (wolfSSL_BIO_write(bio,
" Build without user RSA to print key\n", " Build without user RSA to print key\n",
sizeof(" Build without user RSA to print key\n")) (int)XSTRLEN(" Build without user RSA to print key\n"))
<= 0) { <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -17238,7 +17238,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
if (wolfSSL_BIO_write(bio, if (wolfSSL_BIO_write(bio,
" Public Key Algorithm: EC\n", " Public Key Algorithm: EC\n",
sizeof(" Public Key Algorithm: EC\n")) <= 0) { (int)XSTRLEN(" Public Key Algorithm: EC\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
if (wc_ecc_init_ex(&ecc, x509->heap, INVALID_DEVID) if (wc_ecc_init_ex(&ecc, x509->heap, INVALID_DEVID)
@ -17340,7 +17340,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
/* print out extensions */ /* print out extensions */
if (wolfSSL_BIO_write(bio, " X509v3 extensions:\n", if (wolfSSL_BIO_write(bio, " X509v3 extensions:\n",
sizeof(" X509v3 extensions:\n")) <= 0) { (int)XSTRLEN(" X509v3 extensions:\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -17355,7 +17355,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
if (wolfSSL_BIO_write(bio, if (wolfSSL_BIO_write(bio,
" X509v3 Subject Key Identifier:\n", " X509v3 Subject Key Identifier:\n",
sizeof(" X509v3 Subject Key Identifier:\n")) (int)XSTRLEN(" X509v3 Subject Key Identifier:\n"))
<= 0) { <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -17382,7 +17382,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
if (wolfSSL_BIO_write(bio, if (wolfSSL_BIO_write(bio,
" X509v3 Authority Key Identifier:\n", " X509v3 Authority Key Identifier:\n",
sizeof(" X509v3 Authority Key Identifier:\n")) (int)XSTRLEN(" X509v3 Authority Key Identifier:\n"))
<= 0) { <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -17418,7 +17418,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
wolfSSL_X509_get_issuer_name(x509), buff, issSz); wolfSSL_X509_get_issuer_name(x509), buff, issSz);
if (wolfSSL_BIO_write(bio, "\n DirName:", if (wolfSSL_BIO_write(bio, "\n DirName:",
sizeof("\n DirName:")) <= 0) { (int)XSTRLEN("\n DirName:")) <= 0) {
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(issuer, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(issuer, NULL, DYNAMIC_TYPE_OPENSSL);
#endif #endif
@ -17435,7 +17435,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(issuer, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(issuer, NULL, DYNAMIC_TYPE_OPENSSL);
#endif #endif
if (wolfSSL_BIO_write(bio, "\n", sizeof("\n")) <= 0) { if (wolfSSL_BIO_write(bio, "\n", (int)XSTRLEN("\n")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
} }
@ -17447,7 +17447,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
if (wolfSSL_BIO_write(bio, if (wolfSSL_BIO_write(bio,
"\n X509v3 Basic Constraints:\n", "\n X509v3 Basic Constraints:\n",
sizeof("\n X509v3 Basic Constraints:\n")) (int)XSTRLEN("\n X509v3 Basic Constraints:\n"))
<= 0) { <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -17469,7 +17469,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
if (wolfSSL_BIO_write(bio, if (wolfSSL_BIO_write(bio,
" Signature Algorithm: ", " Signature Algorithm: ",
sizeof(" Signature Algorithm: ")) <= 0) { (int)XSTRLEN(" Signature Algorithm: ")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
XSNPRINTF(tmp, sizeof(tmp) - 1,"%s\n", GetSigName(sigOid)); XSNPRINTF(tmp, sizeof(tmp) - 1,"%s\n", GetSigName(sigOid));
@ -17531,7 +17531,7 @@ WOLFSSL_EVP_PKEY* wolfSSL_X509_get_pubkey(WOLFSSL_X509* x509)
} }
/* done with print out */ /* done with print out */
if (wolfSSL_BIO_write(bio, "\n", sizeof("\n")) <= 0) { if (wolfSSL_BIO_write(bio, "\n\0", (int)XSTRLEN("\n\0")) <= 0) {
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }