Merge branch 'master' of github.com:cyassl/cyassl

This commit is contained in:
toddouska
2013-06-26 11:05:00 -07:00
2 changed files with 3 additions and 2 deletions

View File

@@ -2703,6 +2703,7 @@ static void DecodeCertExtensions(DecodedCert* cert)
case ALT_NAMES_OID: case ALT_NAMES_OID:
DecodeAltNames(&input[idx], length, cert); DecodeAltNames(&input[idx], length, cert);
break;
case AUTH_KEY_OID: case AUTH_KEY_OID:
DecodeAuthKeyId(&input[idx], length, cert); DecodeAuthKeyId(&input[idx], length, cert);

View File

@@ -385,8 +385,8 @@ THREAD_RETURN CYASSL_THREAD server_test(void* args)
if (!useNtruKey && !usePsk) { if (!useNtruKey && !usePsk) {
if (SSL_CTX_use_PrivateKey_file(ctx, ourKey, SSL_FILETYPE_PEM) if (SSL_CTX_use_PrivateKey_file(ctx, ourKey, SSL_FILETYPE_PEM)
!= SSL_SUCCESS) != SSL_SUCCESS)
err_sys("can't load server cert file, check file and run from" err_sys("can't load server private key file, check file and run "
" CyaSSL home dir"); "from CyaSSL home dir");
} }
#endif #endif