diff --git a/README.turnutils b/README.turnutils index a5d7bdf7..7642070f 100644 --- a/README.turnutils +++ b/README.turnutils @@ -300,8 +300,11 @@ helps the access_token validation and decryption. This utility inputs all the keys and lifetimes and any related informations that are needed for encryption or decryption of an access_token. It outputs a JSON with all OAuth PoP parameters that need to pass to the client. Output is generated accoriding -RFC7635 Appendix B, Figure 8. For more details, and for the access_token -structure, read rfc7635. +RFC7635 Appendix B, Figure 8. This utility could help to build an Auth Server +service, but be awere that this utility does not generate "session key" / +"mac_key" and not verifies lifetime of "session key" / "mac_key" or "Auth key". + +For more details, and for the access_token structure, read rfc7635. Use either -e and/or -d flag to encrypt or decrypt access_token. @@ -335,7 +338,7 @@ Options with required values: -q, --token-timestamp timestamp in format 64 bit unsigned (Native format - Unix), so 48 bit for secs since epoch UTC + 16 bit for 1/64000 fractions of a second. - An example: 16 bit left shift the unixtimestamp. (Default: actual gmtime) + e.g.: the actual unixtimestamp 16 bit left shifted. (Default: actual gmtime) -r, --token-lifetime lifetime in sec (Default: 3600) -t, --token base64 encoded encrypted token for validation and decryption diff --git a/man/man1/turnadmin.1 b/man/man1/turnadmin.1 index 746254a3..f2731168 100644 --- a/man/man1/turnadmin.1 +++ b/man/man1/turnadmin.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH TURN 1 "06 September 2016" "" "" +.TH TURN 1 "07 September 2016" "" "" .SH GENERAL INFORMATION \fIturnadmin\fP is a TURN administration tool. This tool can be used to manage diff --git a/man/man1/turnserver.1 b/man/man1/turnserver.1 index bd4d717a..eb385cf6 100644 --- a/man/man1/turnserver.1 +++ b/man/man1/turnserver.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH TURN 1 "06 September 2016" "" "" +.TH TURN 1 "07 September 2016" "" "" .SH GENERAL INFORMATION The \fBTURN Server\fP project contains the source code of a TURN server and TURN client diff --git a/man/man1/turnutils.1 b/man/man1/turnutils.1 index 218a8e30..c32bbf15 100644 --- a/man/man1/turnutils.1 +++ b/man/man1/turnutils.1 @@ -1,5 +1,5 @@ .\" Text automatically generated by txt2man -.TH TURN 1 "06 September 2016" "" "" +.TH TURN 1 "07 September 2016" "" "" .SH GENERAL INFORMATION A set of turnutils_* programs provides some utility functionality to be used @@ -452,8 +452,11 @@ helps the access_token validation and decryption. This utility inputs all the keys and lifetimes and any related informations that are needed for encryption or decryption of an access_token. It outputs a JSON with all OAuth PoP parameters that need to pass to the client. Output is generated accoriding -RFC7635 Appendix B, Figure 8. For more details, and for the access_token -structure, read rfc7635. +RFC7635 Appendix B, Figure 8. This utility could help to build an Auth Server +service, but be awere that this utility does not generate "session key" / +"mac_key" and not verifies lifetime of "session key" / "mac_key" or "Auth key". +.PP +For more details, and for the access_token structure, read rfc7635. .PP Use either \fB\-e\fP and/or \fB\-d\fP flag to encrypt or decrypt access_token. .PP @@ -513,7 +516,7 @@ base64 encoded MAC key \fBbase64\fP(32 octet) = 44 char \fB\-q\fP, \fB\-\-token\-timestamp\fP timestamp in format 64 bit unsigned (Native format \- Unix), so 48 bit for secs since epoch UTC + 16 bit for 1/64000 fractions of a second. -An example: 16 bit left shift the unixtimestamp. (Default: actual gmtime) +e.g.: the actual unixtimestamp 16 bit left shifted. (Default: actual gmtime) .TP .B \fB\-r\fP, \fB\-\-token\-lifetime\fP diff --git a/src/apps/oauth/oauth.c b/src/apps/oauth/oauth.c index 34e6044e..457f5722 100644 --- a/src/apps/oauth/oauth.c +++ b/src/apps/oauth/oauth.c @@ -194,7 +194,7 @@ const char Usage[] = " -p, --token-mac-key base64 encoded MAC key base64(32 octet) = 44 char\n" " -q, --token-timestamp timestamp in format 64 bit unsigned (Native format - Unix),\n" " so 48 bit for secs since epoch UTC + 16 bit for 1/64000 fractions of a second.\n" - " An example: 16 bit left shift the unixtimestamp. (Default: actual gmtime)\n" + " e.g.: the actual unixtimestamp 16 bit left shifted. (Default: actual gmtime)\n" " -r, --token-lifetime lifetime in sec (Default: 3600)\n" " -t, --token base64 encoded encrypted token for validation and decryption\n" " -u, --hmac-alg stun client hmac algorithm\n"; @@ -390,7 +390,7 @@ int main(int argc, char **argv) } if (!(encrypt_flag || decrypt_flag)){ - fprintf(stderr, "Hey, encrypt or decrypt?\nPlease use -h or --help for the detailed help\n"); + fprintf(stderr, "Use either encrypt or decrypt.\nPlease use -h or --help for the detailed help\n"); exit(-1); }