Merge pull request #341 from JacobBarthelmeh/master

SEP and CERTEXT, QSH debug
This commit is contained in:
toddouska
2016-03-10 09:36:25 -08:00
2 changed files with 8 additions and 0 deletions

View File

@@ -3058,6 +3058,7 @@ int MakeMasterSecret(WOLFSSL* ssl)
/* show secret SerSi and CliSi */ /* show secret SerSi and CliSi */
#ifdef SHOW_SECRETS #ifdef SHOW_SECRETS
{
word32 j; word32 j;
printf("QSH generated secret material\n"); printf("QSH generated secret material\n");
printf("SerSi : "); printf("SerSi : ");
@@ -3070,6 +3071,7 @@ int MakeMasterSecret(WOLFSSL* ssl)
printf("%02x", ssl->QSH_secret->CliSi->buffer[j]); printf("%02x", ssl->QSH_secret->CliSi->buffer[j]);
} }
printf("\n"); printf("\n");
}
#endif #endif
} }
#endif #endif

View File

@@ -3832,12 +3832,14 @@ int certext_test(void)
if (cert.isCA) if (cert.isCA)
return -206; return -206;
#ifndef WOLFSSL_SEP /* test only if not using SEP policies */
/* check the Certificate Policies Id */ /* check the Certificate Policies Id */
if (cert.extCertPoliciesNb != 1) if (cert.extCertPoliciesNb != 1)
return -227; return -227;
if (strncmp(cert.extCertPolicies[0], "2.16.840.1.101.3.4.1.42", 23)) if (strncmp(cert.extCertPolicies[0], "2.16.840.1.101.3.4.1.42", 23))
return -228; return -228;
#endif
FreeDecodedCert(&cert); FreeDecodedCert(&cert);
@@ -3881,6 +3883,7 @@ int certext_test(void)
if (cert.isCA) if (cert.isCA)
return -216; return -216;
#ifndef WOLFSSL_SEP /* test only if not using SEP policies */
/* check the Certificate Policies Id */ /* check the Certificate Policies Id */
if (cert.extCertPoliciesNb != 2) if (cert.extCertPoliciesNb != 2)
return -217; return -217;
@@ -3890,6 +3893,7 @@ int certext_test(void)
if (strncmp(cert.extCertPolicies[1], "1.2.13025.489.1.113549", 22)) if (strncmp(cert.extCertPolicies[1], "1.2.13025.489.1.113549", 22))
return -219; return -219;
#endif
FreeDecodedCert(&cert); FreeDecodedCert(&cert);
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
@@ -3933,6 +3937,7 @@ int certext_test(void)
if (!cert.isCA) if (!cert.isCA)
return -226; return -226;
#ifndef WOLFSSL_SEP /* test only if not using SEP policies */
/* check the Certificate Policies Id */ /* check the Certificate Policies Id */
if (cert.extCertPoliciesNb != 2) if (cert.extCertPoliciesNb != 2)
return -227; return -227;
@@ -3942,6 +3947,7 @@ int certext_test(void)
if (strncmp(cert.extCertPolicies[1], "1.2.840.113549.1.9.16.6.5", 25)) if (strncmp(cert.extCertPolicies[1], "1.2.840.113549.1.9.16.6.5", 25))
return -229; return -229;
#endif
FreeDecodedCert(&cert); FreeDecodedCert(&cert);
free(tmp); free(tmp);