From 073d07b7469f6d68187df1bf8cfc17373585e7b0 Mon Sep 17 00:00:00 2001 From: mom040267 Date: Fri, 23 Jan 2015 06:39:10 +0000 Subject: [PATCH] cosmetics --- examples/var/db/turndb | Bin 22528 -> 22528 bytes src/apps/relay/turn_admin_server.c | 47 +++++++++++++++++++---------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/examples/var/db/turndb b/examples/var/db/turndb index e8565976f04396f6cf5b6b3030b43dd7882b95a9..cbfa8c4a177d72689cc86cf5f548ef127152ee58 100644 GIT binary patch delta 77 zcmZqJz}T>Xae_2s=R_H2)=mc9M`{~WRyeaTr7{a|Z1iE`Wi)1h0Y;6DjVg?jd)*tD ZUozj^EEsZ@dGcLv4i=F7=9k{$JOETa6?Fgr delta 187 zcmZqJz}T>Xae_2s^F$eE)@BCXN2(iBRyeaTCo&6fY-D4uuQKM~kk;kp"admin_title"" -static const char* home_link = "
home page
\r\n
Logout

\r\n"; +static const char* home_link = "
home page
\r\n
Logout
\r\n"; static const char* logout_link = "
Logout

\r\n"; static ioa_socket_handle current_socket = NULL; @@ -1848,7 +1848,7 @@ static void write_pc_page(ioa_socket_handle s) str_buffer_append(sb,"\r\n\r\n \r\n "); str_buffer_append(sb,admin_title); - str_buffer_append(sb,"\r\n \r\n \r\n "); + str_buffer_append(sb,"\r\n \r\n \r\n "); str_buffer_append(sb,bold_admin_title); str_buffer_append(sb,"
\r\n"); str_buffer_append(sb,home_link); @@ -2268,7 +2268,7 @@ static void write_ps_page(ioa_socket_handle s, const char* client_protocol, cons str_buffer_append(sb,"\r\n\r\n \r\n "); str_buffer_append(sb,admin_title); - str_buffer_append(sb,"\r\n \r\n \r\n "); + str_buffer_append(sb,"\r\n \r\n \r\n "); str_buffer_append(sb,bold_admin_title); str_buffer_append(sb,"
\r\n"); str_buffer_append(sb,home_link); @@ -2403,7 +2403,7 @@ static void write_users_page(ioa_socket_handle s, const u08bits *add_user, const str_buffer_append(sb,"\r\n\r\n \r\n "); str_buffer_append(sb,admin_title); - str_buffer_append(sb,"\r\n \r\n \r\n "); + str_buffer_append(sb,"\r\n \r\n \r\n "); str_buffer_append(sb,bold_admin_title); str_buffer_append(sb,"
\r\n"); str_buffer_append(sb,home_link); @@ -2575,7 +2575,7 @@ static void write_shared_secrets_page(ioa_socket_handle s, const char* add_secre str_buffer_append(sb,"\r\n\r\n \r\n "); str_buffer_append(sb,admin_title); - str_buffer_append(sb,"\r\n \r\n \r\n "); + str_buffer_append(sb,"\r\n \r\n \r\n "); str_buffer_append(sb,bold_admin_title); str_buffer_append(sb,"
\r\n"); str_buffer_append(sb,home_link); @@ -2726,7 +2726,7 @@ static void write_origins_page(ioa_socket_handle s, const char* add_origin, cons str_buffer_append(sb,"\r\n\r\n \r\n "); str_buffer_append(sb,admin_title); - str_buffer_append(sb,"\r\n \r\n \r\n "); + str_buffer_append(sb,"\r\n \r\n \r\n "); str_buffer_append(sb,bold_admin_title); str_buffer_append(sb,"
\r\n"); str_buffer_append(sb,home_link); @@ -2891,7 +2891,7 @@ static void write_https_oauth_page(ioa_socket_handle s, const char* add_kid, con str_buffer_append(sb,"\r\n\r\n \r\n "); str_buffer_append(sb,admin_title); - str_buffer_append(sb,"\r\n \r\n \r\n "); + str_buffer_append(sb,"\r\n \r\n \r\n "); str_buffer_append(sb,bold_admin_title); str_buffer_append(sb,"
\r\n"); str_buffer_append(sb,home_link); @@ -2909,6 +2909,8 @@ static void write_https_oauth_page(ioa_socket_handle s, const char* add_kid, con str_buffer_append(sb,"
"); } + str_buffer_append(sb,"\r\n
"); + { if(!add_kid) add_kid=""; @@ -2916,21 +2918,26 @@ static void write_https_oauth_page(ioa_socket_handle s, const char* add_kid, con str_buffer_append(sb,HR_ADD_OAUTH_KID); str_buffer_append(sb,"\" value=\""); str_buffer_append(sb,(const char*)add_kid); - str_buffer_append(sb,"\" required "); - str_buffer_append(sb,">
\r\n"); + str_buffer_append(sb,"\">
\r\n"); } + + str_buffer_append(sb,"		"); + { if(!add_ikm) add_ikm = ""; - str_buffer_append(sb,"
Base64-encoded input keying material: Base64-encoded input keying material:
"); + str_buffer_append(sb,"
\r\n"); } + + str_buffer_append(sb,"
"); + { - str_buffer_append(sb,">
Hash key derivation function:
\r\n"); + str_buffer_append(sb,"
Hash key derivation function:
\r\n"); if(!add_hkdf_hash_func || !add_hkdf_hash_func[0]) add_hkdf_hash_func = "SHA-256"; @@ -2951,8 +2958,11 @@ static void write_https_oauth_page(ioa_socket_handle s, const char* add_kid, con } str_buffer_append(sb,">SHA-256\r\n
\r\n"); } + + str_buffer_append(sb,"		"); + { - str_buffer_append(sb,">
Token encryption algorithm:
\r\n"); + str_buffer_append(sb,"
Token encryption algorithm:
\r\n"); if(!add_tea || !add_tea[0]) add_tea = "AES-256-CBC"; @@ -2989,8 +2999,11 @@ static void write_https_oauth_page(ioa_socket_handle s, const char* add_kid, con } str_buffer_append(sb,">AEAD-AES-256-GCM\r\n
\r\n"); } + + str_buffer_append(sb,"		"); + { - str_buffer_append(sb,">
Token authentication algorithm:
\r\n"); + str_buffer_append(sb,"
Token authentication algorithm:
\r\n"); if(!add_aa || !add_aa[0]) add_aa = "HMAC-SHA-256-128"; @@ -3020,6 +3033,8 @@ static void write_https_oauth_page(ioa_socket_handle s, const char* add_kid, con str_buffer_append(sb,">HMAC-SHA-1\r\n
\r\n"); } + str_buffer_append(sb,"
\r\n"); + str_buffer_append(sb,"
"); str_buffer_append(sb,"\r\n");