arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Removed some printfs in skeleton mode

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@258 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
cameronrich
2016-07-05 20:16:05 +00:00
committed by Yasuki Ikeuchi
parent 6d0a2c03c3
commit 106a59cf23
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ssl/loader.c
View File

@ -82,7 +82,9 @@ EXP_FUNC int STDCALL ssl_obj_load(SSL_CTX *ssl_ctx, int obj_type,
#ifdef CONFIG_SSL_HAS_PEM #ifdef CONFIG_SSL_HAS_PEM
ret = ssl_obj_PEM_load(ssl_ctx, obj_type, ssl_obj, password); ret = ssl_obj_PEM_load(ssl_ctx, obj_type, ssl_obj, password);
#else #else
#ifdef CONFIG_SSL_FULL_MODE
printf("%s", unsupported_str); printf("%s", unsupported_str);
#endif
ret = SSL_ERROR_NOT_SUPPORTED; ret = SSL_ERROR_NOT_SUPPORTED;
#endif #endif
} }
@ -93,7 +95,9 @@ error:
ssl_obj_free(ssl_obj); ssl_obj_free(ssl_obj);
return ret; return ret;
#else #else
#ifdef CONFIG_SSL_FULL_MODE
printf("%s", unsupported_str); printf("%s", unsupported_str);
#endif
return SSL_ERROR_NOT_SUPPORTED; return SSL_ERROR_NOT_SUPPORTED;
#endif /* CONFIG_SSL_SKELETON_MODE */ #endif /* CONFIG_SSL_SKELETON_MODE */
} }
@ -150,7 +154,9 @@ static int do_obj(SSL_CTX *ssl_ctx, int obj_type,
break; break;
#endif #endif
default: default:
#ifdef CONFIG_SSL_FULL_MODE
printf("%s", unsupported_str); printf("%s", unsupported_str);
#endif
ret = SSL_ERROR_NOT_SUPPORTED; ret = SSL_ERROR_NOT_SUPPORTED;
break; break;
} }
@ -223,7 +229,7 @@ static int pem_decrypt(const char *where, const char *end,
if (password == NULL || strlen(password) == 0) if (password == NULL || strlen(password) == 0)
{ {
#ifdef CONFIG_SSL_FULL_MODE #ifdef CONFIG_SSL_FULL_MODE
printf("Error: Need a password for this PEM file\n"); TTY_FLUSH(); printf("Error: Need a password for this PEM file\n");
#endif #endif
goto error; goto error;
} }
@ -240,7 +246,7 @@ static int pem_decrypt(const char *where, const char *end,
else else
{ {
#ifdef CONFIG_SSL_FULL_MODE #ifdef CONFIG_SSL_FULL_MODE
printf("Error: Unsupported password cipher\n"); TTY_FLUSH(); printf("Error: Unsupported password cipher\n");
#endif #endif
goto error; goto error;
} }
@ -475,7 +481,7 @@ error:
#ifdef CONFIG_SSL_FULL_MODE #ifdef CONFIG_SSL_FULL_MODE
if (ret) if (ret)
{ {
printf("Error: Certificate or key not loaded\n"); TTY_FLUSH(); printf("Error: Certificate or key not loaded\n");
} }
#endif #endif

2
ssl/openssl.c
View File

@ -85,8 +85,6 @@ SSL * SSL_new(SSL_CTX *ssl_ctx)
ssl = ssl_new(ssl_ctx, -1); /* fd is set later */ ssl = ssl_new(ssl_ctx, -1); /* fd is set later */
#ifdef CONFIG_SSL_ENABLE_CLIENT #ifdef CONFIG_SSL_ENABLE_CLIENT
ssl_func_type
if (ssl_func_type == SSLv3_client_method || if (ssl_func_type == SSLv3_client_method ||
ssl_func_type == TLSv1_client_method) ssl_func_type == TLSv1_client_method)
{ {

7
ssl/tls1.c
View File

@ -1223,7 +1223,9 @@ int basic_read(SSL *ssl, uint8_t **in_data)
/* check for sslv2 "client hello" */ /* check for sslv2 "client hello" */
if (buf[0] & 0x80 && buf[2] == 1) if (buf[0] & 0x80 && buf[2] == 1)
{ {
printf("Error: no SSLv23 handshaking allowed\n"); TTY_FLUSH(); #ifdef CONFIG_SSL_FULL_MODE
printf("Error: no SSLv23 handshaking allowed\n");
#endif
ret = SSL_ERROR_NOT_SUPPORTED; ret = SSL_ERROR_NOT_SUPPORTED;
goto error; /* not an error - just get out of here */ goto error; /* not an error - just get out of here */
} }
@ -2054,7 +2056,6 @@ void DISPLAY_STATE(SSL *ssl, int is_send, uint8_t state, int not_ok)
} }
printf("%s\n", str); printf("%s\n", str);
TTY_FLUSH();
} }
/** /**
@ -2174,7 +2175,6 @@ EXP_FUNC void STDCALL ssl_display_error(int error_code)
} }
printf("\n"); printf("\n");
TTY_FLUSH();
} }
/** /**
@ -2235,7 +2235,6 @@ void DISPLAY_ALERT(SSL *ssl, int alert)
} }
printf("\n"); printf("\n");
TTY_FLUSH();
} }
#endif /* CONFIG_SSL_FULL_MODE */ #endif /* CONFIG_SSL_FULL_MODE */