libtinytac: moving RFC definitions to new file

3 files changed, 153 insertions, 61 deletions

diff --git a/Makefile.am b/Makefile.am
index 8db78d6..1ea7300 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -135,6 +135,7 @@ if ENABLE_EXAMPLES
 endif
 if ENABLE_LIBTINYTAC
    include_HEADERS                      += include/tinytac.h
+   include_HEADERS                      += include/tinytac_plus.h
    lib_LTLIBRARIES                      += lib/libtinytac.la
 else
    noinst_HEADERS                       += include/tinytac.h
@@ -162,6 +163,7 @@ lib_libtinytac_a_CFLAGS			= $(AM_CFLAGS)
 lib_libtinytac_a_SOURCES                = $(lib_libbindle_a_SOURCES) \
                                           include/bindle_prefix.h \
                                           include/tinytac.h \
+                                          include/tinytac_plus.h \
                                           include/tinytac_compat.h \
                                           lib/libtinytac/libtinytac.h \
                                           lib/libtinytac/ldebug.c \
diff --git a/include/tinytac.h b/include/tinytac.h
index ad86bb9..106a71e 100644
--- a/include/tinytac.h
+++ b/include/tinytac.h
@@ -42,6 +42,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <sys/types.h>
+#include <tinytac_plus.h>
 
 
 //////////////
@@ -136,67 +137,6 @@
 #define TTAC_DFLT_DEBUG_SYSLOG            TTAC_NO
 
 
-// RFC8907 Section 4.1 The TACACS+ Packet Header
-#define TTAC_MAJOR_VER              0x0c  // RFC name: TTAC_PLUS_MAJOR_VER
-#define TTAC_MINOR_VER_DEFAULT      0x00  // RFC name: TTAC_PLUS_MINOR_VER_DEFAULT
-#define TTAC_MINOR_VER_ONE          0x01  // RFC name: TTAC_PLUS_MINOR_VER_ONE
-#define TTAC_TYPE_AUTHEN            0x01  // RFC name: TTAC_PLUS_AUTHEN
-#define TTAC_TYPE_AUTHOR            0x02  // RFC name: TTAC_PLUS_AUTHOR
-#define TTAC_TYPE_ACCT              0x03  // RFC name: TTAC_PLUS_ACCT
-#define TTAC_FLAG_UNENCRYPTED       0x01  // RFC name: TAC_PLUS_UNENCRYPTED_FLAG
-#define TTAC_FLAG_SINGLE_CONNECT    0x04  // RFC name: TAC_PLUS_SINGLE_CONNECT_FLAG
-
-
-// RFC8907 Section 5.1 The Authentication START Packet Body
-#define TTAC_AUTHEN_LOGIN           0x01  // RFC name: TAC_PLUS_AUTHEN_LOGIN
-#define TTAC_AUTHEN_CHPASS          0x02  // RFC name: TAC_PLUS_AUTHEN_CHPASS
-#define TTAC_AUTHEN_SENDAUTH        0x04  // RFC name: TAC_PLUS_AUTHEN_SENDAUTH
-#define TTAC_AUTHEN_TYPE_ASCII      0x01  // RFC name: TAC_PLUS_AUTHEN_TYPE_ASCII
-#define TTAC_AUTHEN_TYPE_PAP        0x02  // RFC name: TAC_PLUS_AUTHEN_TYPE_PAP
-#define TTAC_AUTHEN_TYPE_CHAP       0x03  // RFC name: TAC_PLUS_AUTHEN_TYPE_CHAP
-#define TTAC_AUTHEN_TYPE_MSCHAP     0x05  // RFC name: TAC_PLUS_AUTHEN_TYPE_MSCHAP
-#define TTAC_AUTHEN_TYPE_MSCHAPV2   0x06  // RFC name: TAC_PLUS_AUTHEN_TYPE_MSCHAPV2
-#define TTAC_AUTHEN_SVC_NONE        0x00  // RFC name: TAC_PLUS_AUTHEN_SVC_NONE
-#define TTAC_AUTHEN_SVC_LOGIN       0x01  // RFC name: TAC_PLUS_AUTHEN_SVC_LOGIN
-#define TTAC_AUTHEN_SVC_ENABLE      0x02  // RFC name: TAC_PLUS_AUTHEN_SVC_ENABLE
-#define TTAC_AUTHEN_SVC_PPP         0x03  // RFC name: TAC_PLUS_AUTHEN_SVC_PPP
-#define TTAC_AUTHEN_SVC_PT          0x05  // RFC name: TAC_PLUS_AUTHEN_SVC_PT
-#define TTAC_AUTHEN_SVC_RCMD        0x06  // RFC name: TAC_PLUS_AUTHEN_SVC_RCMD
-#define TTAC_AUTHEN_SVC_X25         0x07  // RFC name: TAC_PLUS_AUTHEN_SVC_X25
-#define TTAC_AUTHEN_SVC_NASI        0x08  // RFC name: TAC_PLUS_AUTHEN_SVC_NASI
-#define TTAC_AUTHEN_SVC_FWPROXY     0x09  // RFC name: TAC_PLUS_AUTHEN_SVC_FWPROXY
-
-
-// RFC8907 Section 5.2 The Authentication REPLY Packet Body
-#define TTAC_AUTHEN_STATUS_PASS     0x01  // RFC name: TAC_PLUS_AUTHEN_STATUS_PASS
-#define TTAC_AUTHEN_STATUS_FAIL     0x02  // RFC name: TAC_PLUS_AUTHEN_STATUS_FAIL
-#define TTAC_AUTHEN_STATUS_GETDATA  0x03  // RFC name: TAC_PLUS_AUTHEN_STATUS_GETDATA
-#define TTAC_AUTHEN_STATUS_GETUSER  0x04  // RFC name: TAC_PLUS_AUTHEN_STATUS_GETUSER
-#define TTAC_AUTHEN_STATUS_GETPASS  0x05  // RFC name: TAC_PLUS_AUTHEN_STATUS_GETPASS
-#define TTAC_AUTHEN_STATUS_RESTART  0x06  // RFC name: TAC_PLUS_AUTHEN_STATUS_RESTART
-#define TTAC_AUTHEN_STATUS_ERROR    0x07  // RFC name: TAC_PLUS_AUTHEN_STATUS_ERROR
-#define TTAC_AUTHEN_STATUS_FOLLOW   0x21  // RFC name: TAC_PLUS_AUTHEN_STATUS_FOLLOW
-#define TTAC_REPLY_FLAG_NOECHO      0x01  // RFC name: TAC_PLUS_REPLY_FLAG_NOECHO
-
-
-// RFC8907 Section 5.3 The Authentication CONTINUE Packet Body
-#define TTAC_CONTINUE_FLAG_ABORT    0x01  // RFC name: TAC_PLUS_CONTINUE_FLAG_ABORT
-
-
-// RFC8907 Section 6.1 The Authorization REQUEST Packet Body
-#define TTAC_AUTHEN_METH_NOT_SET    0x00  // RFC name: TAC_PLUS_AUTHEN_METH_NOT_SET
-#define TTAC_AUTHEN_METH_NONE       0x01  // RFC name: TAC_PLUS_AUTHEN_METH_NONE
-#define TTAC_AUTHEN_METH_KRB5       0x02  // RFC name: TAC_PLUS_AUTHEN_METH_KRB5
-#define TTAC_AUTHEN_METH_LINE       0x03  // RFC name: TAC_PLUS_AUTHEN_METH_LINE
-#define TTAC_AUTHEN_METH_ENABLE     0x04  // RFC name: TAC_PLUS_AUTHEN_METH_ENABLE
-#define TTAC_AUTHEN_METH_LOCAL      0x05  // RFC name: TAC_PLUS_AUTHEN_METH_LOCAL
-#define TTAC_AUTHEN_METH_TACACSPLUS 0x06  // RFC name: TAC_PLUS_AUTHEN_METH_TACACSPLUS
-#define TTAC_AUTHEN_METH_GUEST      0x08  // RFC name: TAC_PLUS_AUTHEN_METH_GUEST
-#define TTAC_AUTHEN_METH_RADIUS     0x10  // RFC name: TAC_PLUS_AUTHEN_METH_RADIUS
-#define TTAC_AUTHEN_METH_KRB4       0x11  // RFC name: TAC_PLUS_AUTHEN_METH_KRB4
-#define TTAC_AUTHEN_METH_RCMD       0x20  // RFC name: TAC_PLUS_AUTHEN_METH_RCMD
-
-
 //////////////////
 //              //
 //  Data Types  //
diff --git a/include/tinytac_plus.h b/include/tinytac_plus.h
new file mode 100644
index 0000000..4d45979
--- /dev/null
+++ b/include/tinytac_plus.h
@@ -0,0 +1,150 @@
+/*
+ *  Tiny TACACS+ Client Library
+ *  Copyright (C) 2022 David M. Syzdek <david@syzdek.net>.
+ *  All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of David M. Syzdek nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ *  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DAVID M. SYZDEK BE LIABLE FOR
+ *  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ *  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ *  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ *  SUCH DAMAGE.
+ */
+#ifndef __TINYTAC_PLUS_H
+#define __TINYTAC_PLUS_H 1
+
+///////////////////
+//               //
+//  Definitions  //
+//               //
+///////////////////
+#pragma mark - Definitions
+
+// The following definitions are documented in RFC 8907, "The Terminal Access
+// Controller Access-Control System Plus (TACACS+) Protocol".  The definitions
+// in this header may conflict with other headers which declare the same
+// definitions from RFC 8907.
+
+
+// RFC8907 Section 4.1. The TACACS+ Packet Header
+// major_version
+#define TAC_PLUS_MAJOR_VER                0x0c
+// minor_version
+#define TAC_PLUS_MINOR_VER_DEFAULT        0x00
+#define TAC_PLUS_MINOR_VER_ONE            0x01
+// type
+#define TAC_PLUS_TYPE_AUTHEN              0x01
+#define TAC_PLUS_TYPE_AUTHOR              0x02
+#define TAC_PLUS_TYPE_ACCT                0x03
+// flags
+#define TAC_PLUS_FLAG_UNENCRYPTED         0x01
+#define TAC_PLUS_FLAG_SINGLE_CONNECT      0x04
+
+
+// RFC8907 Section 5.1 The Authentication START Packet Body
+// action
+#define TAC_PLUS_AUTHEN_LOGIN             0x01
+#define TAC_PLUS_AUTHEN_CHPASS            0x02
+#define TAC_PLUS_AUTHEN_SENDAUTH          0x04
+// authen_type
+#define TAC_PLUS_AUTHEN_TYPE_NOT_SET      0x00 // RFC8907 Section 6.1 The Authorization REQUEST Packet Body: authen_type
+#define TAC_PLUS_AUTHEN_TYPE_ASCII        0x01
+#define TAC_PLUS_AUTHEN_TYPE_PAP          0x02
+#define TAC_PLUS_AUTHEN_TYPE_CHAP         0x03
+#define TAC_PLUS_AUTHEN_TYPE_MSCHAP       0x05
+#define TAC_PLUS_AUTHEN_TYPE_MSCHAPV2     0x06
+// authen_service
+#define TAC_PLUS_AUTHEN_SVC_NONE          0x00
+#define TAC_PLUS_AUTHEN_SVC_LOGIN         0x01
+#define TAC_PLUS_AUTHEN_SVC_ENABLE        0x02
+#define TAC_PLUS_AUTHEN_SVC_PPP           0x03
+#define TAC_PLUS_AUTHEN_SVC_PT            0x05
+#define TAC_PLUS_AUTHEN_SVC_RCMD          0x06
+#define TAC_PLUS_AUTHEN_SVC_X25           0x07
+#define TAC_PLUS_AUTHEN_SVC_NASI          0x08
+#define TAC_PLUS_AUTHEN_SVC_FWPROXY       0x09
+
+
+// RFC8907 Section 5.2 The Authentication REPLY Packet Body
+// status
+#define TAC_PLUS_AUTHEN_STATUS_PASS       0x01
+#define TAC_PLUS_AUTHEN_STATUS_FAIL       0x02
+#define TAC_PLUS_AUTHEN_STATUS_GETDATA    0x03
+#define TAC_PLUS_AUTHEN_STATUS_GETUSER    0x04
+#define TAC_PLUS_AUTHEN_STATUS_GETPASS    0x05
+#define TAC_PLUS_AUTHEN_STATUS_RESTART    0x06
+#define TAC_PLUS_AUTHEN_STATUS_ERROR      0x07
+#define TAC_PLUS_AUTHEN_STATUS_FOLLOW     0x21
+// flags
+#define TAC_PLUS_REPLY_FLAG_NOECHO        0x01
+
+
+// RFC8907 Section 5.3 The Authentication CONTINUE Packet Body
+// flags
+#define TAC_PLUS_CONTINUE_FLAG_ABORT      0x01
+
+
+// RFC8907 Section 6.1 The Authorization REQUEST Packet Body
+// authen_method
+#define TAC_PLUS_AUTHEN_METH_NOT_SET      0x00
+#define TAC_PLUS_AUTHEN_METH_NONE         0x01
+#define TAC_PLUS_AUTHEN_METH_KRB5         0x02
+#define TAC_PLUS_AUTHEN_METH_LINE         0x03
+#define TAC_PLUS_AUTHEN_METH_ENABLE       0x04
+#define TAC_PLUS_AUTHEN_METH_LOCAL        0x05
+#define TAC_PLUS_AUTHEN_METH_TACACSPLUS   0x06
+#define TAC_PLUS_AUTHEN_METH_GUEST        0x08
+#define TAC_PLUS_AUTHEN_METH_RADIUS       0x10
+#define TAC_PLUS_AUTHEN_METH_KRB4         0x11
+#define TAC_PLUS_AUTHEN_METH_RCMD         0x20
+
+
+// RFC8907 Section 6.2. The Authorization REPLY Packet Body
+// status
+#define TAC_PLUS_AUTHOR_STATUS_PASS_ADD   0x01
+#define TAC_PLUS_AUTHOR_STATUS_PASS_REPL  0x02
+#define TAC_PLUS_AUTHOR_STATUS_FAIL       0x10
+#define TAC_PLUS_AUTHOR_STATUS_ERROR      0x11
+#define TAC_PLUS_AUTHOR_STATUS_FOLLOW     0x21
+
+
+// RFC8907 Section 7.1. The Account REQUEST Packet Body
+// flags
+#define TAC_PLUS_ACCT_FLAG_START          0x02
+#define TAC_PLUS_ACCT_FLAG_STOP           0x04
+#define TAC_PLUS_ACCT_FLAG_WATCHDOG       0x08
+
+
+// RFC8907 7.2. The Accounting REPLY Packet Body
+// status
+#define TAC_PLUS_ACCT_STATUS_SUCCESS      0x01
+#define TAC_PLUS_ACCT_STATUS_ERROR        0x02
+#define TAC_PLUS_ACCT_STATUS_FOLLOW       0x21
+
+
+// RFC8907 9. Privilege Levels
+#define TAC_PLUS_PRIV_LVL_MIN             0x00
+#define TAC_PLUS_PRIV_LVL_USER            0x01
+#define TAC_PLUS_PRIV_LVL_ROOT            0x0f
+#define TAC_PLUS_PRIV_LVL_MAX             0x0f
+
+
+#endif /* end of header */