alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

components/openssl: add function "ssl_pm_get_verify_result"

Browse Source 
1. add function ssl_pm_get_verify_result
	2. add its platform low-level interface
This commit is contained in:
dongheng 2016-09-22 15:15:16 +08:00
parent 2cc32db52d
commit b3145446aa
8 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/openssl/include/internal/ssl_code.h
View File

@ -17,6 +17,7 @@
#include "ssl3.h"
#include "tls1.h"
#include "x509_vfy.h"
/* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
# define SSL_SENT_SHUTDOWN 1

2
components/openssl/include/internal/ssl_methods.h
View File

@ -21,6 +21,7 @@
read, send, pending, \
set_fd, get_fd, \
set_bufflen, \
get_verify_result, \
get_state) \
static const SSL_METHOD_FUNC func_name LOCAL_ATRR = { \
new, \
@ -34,6 +35,7 @@
set_fd, \
get_fd, \
set_bufflen, \
get_verify_result, \
get_state \
};

4
components/openssl/include/internal/ssl_types.h
View File

@ -193,6 +193,8 @@ struct ssl_st
X509 *client_CA;
long verify_result;
int err;
void (*info_callback) (const SSL *ssl, int type, int val);
@ -235,6 +237,8 @@ struct ssl_method_func_st {
void (*ssl_set_bufflen)(SSL *ssl, int len);
long (*ssl_get_verify_result)(const SSL *ssl);
OSSL_HANDSHAKE_STATE (*ssl_get_state)(const SSL *ssl);
};

2
components/openssl/include/platform/ssl_pm.h
View File

@ -49,4 +49,6 @@ void pkey_pm_free(EVP_PKEY *pkey);
int pkey_pm_load(EVP_PKEY *pkey, const unsigned char *buffer, int len);
void pkey_pm_unload(EVP_PKEY *pkey);
long ssl_pm_get_verify_result(const SSL *ssl);
#endif

14
components/openssl/library/ssl_lib.c
View File

@ -1731,3 +1731,17 @@ void SSL_set_verify(SSL *ssl, int mode, int (*verify_callback)(int, X509_STORE_C
SSL_ASSERT(ssl);
SSL_ASSERT(verify_callback);
}
/*
* SSL_get_verify_result - get the verifying result of the SSL certification
*
* @param ssl - the SSL point
*
* @return the result of verifying
*/
long SSL_get_verify_result(const SSL *ssl)
{
SSL_ASSERT(ssl);
return SSL_METHOD_CALL(get_verify_result, ssl);
}

1
components/openssl/library/ssl_methods.c
View File

@ -25,6 +25,7 @@ IMPLEMENT_TLS_METHOD_FUNC(TLS_method_func,
ssl_pm_read, ssl_pm_send, ssl_pm_pending,
ssl_pm_set_fd, ssl_pm_get_fd,
ssl_pm_set_bufflen,
ssl_pm_get_verify_result,
ssl_pm_get_state);
/*

4
components/openssl/library/ssl_x509.c
View File

@ -114,8 +114,6 @@ failed1:
*/
int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x)
{
int ret;
SSL_ASSERT(ctx);
SSL_ASSERT(x);
@ -139,8 +137,6 @@ int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x)
*/
int SSL_add_client_CA(SSL *ssl, X509 *x)
{
int ret;
SSL_ASSERT(ssl);
SSL_ASSERT(x);

16
components/openssl/platform/ssl_pm.c
View File

@ -444,3 +444,19 @@ void ssl_pm_set_bufflen(SSL *ssl, int len)
{
max_content_len = len;
}
long ssl_pm_get_verify_result(const SSL *ssl)
{
long ret;
long verify_result;
struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm;
ret = mbedtls_ssl_get_verify_result(&ssl_pm->ssl);
if (!ret)
verify_result = X509_V_OK;
else
verify_result = X509_V_ERR_UNSPECIFIED;
return verify_result;
}