Imported Upstream version 5.3.3

2 files changed, 86 insertions, 2 deletions

diff --git a/src/libtncif/tncif_pa_subtypes.c b/src/libtncif/tncif_pa_subtypes.c
index bf1e999b3..d83c3255d 100644
--- a/src/libtncif/tncif_pa_subtypes.c
+++ b/src/libtncif/tncif_pa_subtypes.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Andreas Steffen
+ * Copyright (C) 2010-2015 Andreas Steffen
  *
  * HSR Hochschule fuer Technik Rapperswil
  *
@@ -16,6 +16,7 @@
 
 #include "tncif_pa_subtypes.h"
 
+/* IETF PA Subtype names */
 ENUM_BEGIN(pa_subtype_ietf_names, PA_SUBTYPE_IETF_TESTING, PA_SUBTYPE_IETF_NEA_CLIENT,
 	"Testing",
 	"Operating System",
@@ -33,6 +34,7 @@ ENUM_NEXT(pa_subtype_ietf_names, PA_SUBTYPE_IETF_ANY, PA_SUBTYPE_IETF_ANY,
 );
 ENUM_END(pa_subtype_ietf_names, PA_SUBTYPE_IETF_ANY);
 
+/* TCG PA Subtype names */
 ENUM_BEGIN(pa_subtype_tcg_names, PA_SUBTYPE_TCG_PTS, PA_SUBTYPE_TCG_SWID,
 	"PTS",
 	"SCAP",
@@ -44,6 +46,56 @@ ENUM_NEXT(pa_subtype_tcg_names, PA_SUBTYPE_TCG_ANY, PA_SUBTYPE_TCG_ANY,
 );
 ENUM_END(pa_subtype_tcg_names, PA_SUBTYPE_TCG_ANY);
 
+/* PWG PA Subtype names */
+ENUM_BEGIN(pa_subtype_pwg_names, PA_SUBTYPE_PWG_HCD_TESTING,
+								 PA_SUBTYPE_PWG_HCD_UNKNOWN,
+	"HCD Testing",
+	"HCD Other",
+	"HCD Unknown"
+);
+ENUM_NEXT(pa_subtype_pwg_names, PA_SUBTYPE_PWG_HCD_CONSOLE,
+								PA_SUBTYPE_PWG_HCD_COVER,
+								PA_SUBTYPE_PWG_HCD_UNKNOWN,
+	"HCD Console",
+	"HCD System",
+	"HCD Cover"
+);
+ENUM_NEXT(pa_subtype_pwg_names, PA_SUBTYPE_PWG_HCD_INPUT_TRAY,
+								PA_SUBTYPE_PWG_HCD_MARKER,
+								PA_SUBTYPE_PWG_HCD_COVER,
+	"HCD Input Tray",
+	"HCD Output Tray",
+	"HCD Marker"
+);
+ENUM_NEXT(pa_subtype_pwg_names, PA_SUBTYPE_PWG_HCD_MEDIA_PATH,
+								PA_SUBTYPE_PWG_HCD_INTERPRETER,
+								PA_SUBTYPE_PWG_HCD_MARKER,
+	"HCD Media Path",
+	"HCD Channel",
+	"HCD Interpreter"
+);
+ENUM_NEXT(pa_subtype_pwg_names, PA_SUBTYPE_PWG_HCD_FINISHER,
+								PA_SUBTYPE_PWG_HCD_FINISHER,
+								PA_SUBTYPE_PWG_HCD_INTERPRETER,
+	"HCD Finisher"
+);
+ENUM_NEXT(pa_subtype_pwg_names, PA_SUBTYPE_PWG_HCD_INTERFACE,
+								PA_SUBTYPE_PWG_HCD_INTERFACE,
+								PA_SUBTYPE_PWG_HCD_FINISHER,
+	"HCD Interface"
+);
+ENUM_NEXT(pa_subtype_pwg_names, PA_SUBTYPE_PWG_HCD_SCANNER,
+								PA_SUBTYPE_PWG_HCD_SCANNER,
+								PA_SUBTYPE_PWG_HCD_INTERFACE,
+	"HCD Scanner"
+);
+ENUM_NEXT(pa_subtype_pwg_names, PA_SUBTYPE_PWG_ANY, PA_SUBTYPE_PWG_ANY,
+								PA_SUBTYPE_PWG_HCD_SCANNER,
+	"ANY"
+);
+ENUM_END(pa_subtype_pwg_names, PA_SUBTYPE_PWG_ANY);
+
+/* FHH PA Subtype names */
 ENUM_BEGIN(pa_subtype_fhh_names, PA_SUBTYPE_FHH_HOSTSCANNER, PA_SUBTYPE_FHH_DUMMY,
 	"HostScanner",
 	"Dummy"
@@ -63,6 +115,7 @@ ENUM_NEXT(pa_subtype_fhh_names, PA_SUBTYPE_FHH_ANY, PA_SUBTYPE_FHH_ANY,
 );
 ENUM_END(pa_subtype_fhh_names, PA_SUBTYPE_FHH_ANY);
 
+/* ITA-HSR PA Subtype names */
 ENUM_BEGIN(pa_subtype_ita_names, PA_SUBTYPE_ITA_TEST, PA_SUBTYPE_ITA_ECHO,
 	"Test",
 	"Echo"
@@ -84,6 +137,8 @@ enum_name_t* get_pa_subtype_names(pen_t pen)
 			return pa_subtype_ietf_names;
 		case PEN_TCG:
 			return pa_subtype_tcg_names;
+		case PEN_PWG:
+			return pa_subtype_pwg_names;
 		case PEN_FHH:
 			return pa_subtype_fhh_names;
 		case PEN_ITA:
diff --git a/src/libtncif/tncif_pa_subtypes.h b/src/libtncif/tncif_pa_subtypes.h
index 0855d1df3..d6dcad025 100644
--- a/src/libtncif/tncif_pa_subtypes.h
+++ b/src/libtncif/tncif_pa_subtypes.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2011 Andreas Steffen, HSR Hochschule fuer Technik Rapperswil
+ * Copyright (C) 2011-2015 Andreas Steffen
+ * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -22,6 +23,7 @@
 
 typedef enum pa_subtype_ietf_t pa_subtype_ietf_t;
 typedef enum pa_subtype_tcg_t pa_subtype_tcg_t;
+typedef enum pa_subtype_pwg_t pa_subtype_pwg_t;
 typedef enum pa_subtype_fhh_t pa_subtype_fhh_t;
 typedef enum pa_subtype_ita_t pa_subtype_ita_t;
 
@@ -65,6 +67,33 @@ extern enum_name_t *pa_subtype_ietf_names;
 extern enum_name_t *pa_subtype_tcg_names;
 
 /**
+ * PA-TNC PWG Subtypes
+ */
+ enum pa_subtype_pwg_t {
+	PA_SUBTYPE_PWG_HCD_TESTING =		0x00,
+	PA_SUBTYPE_PWG_HCD_OTHER =			0x01,
+	PA_SUBTYPE_PWG_HCD_UNKNOWN =		0x02,
+	PA_SUBTYPE_PWG_HCD_CONSOLE =		0x04,
+	PA_SUBTYPE_PWG_HCD_SYSTEM =			0x05,
+	PA_SUBTYPE_PWG_HCD_COVER =			0x06,
+	PA_SUBTYPE_PWG_HCD_INPUT_TRAY =		0x08,
+	PA_SUBTYPE_PWG_HCD_OUTPUT_TRAY =	0x09,
+	PA_SUBTYPE_PWG_HCD_MARKER =			0x0a,
+	PA_SUBTYPE_PWG_HCD_MEDIA_PATH =		0x0d,
+	PA_SUBTYPE_PWG_HCD_CHANNEL =		0x0e,
+	PA_SUBTYPE_PWG_HCD_INTERPRETER =	0x0f,
+	PA_SUBTYPE_PWG_HCD_FINISHER =		0x1e,
+	PA_SUBTYPE_PWG_HCD_INTERFACE =		0x28,
+	PA_SUBTYPE_PWG_HCD_SCANNER =		0x32,
+	PA_SUBTYPE_PWG_ANY =				0xff
+};
+
+/**
+ * enum name for pa_subtype_pwg_t.
+ */
+extern enum_name_t *pa_subtype_pwg_names;
+
+/**
  * PA-TNC FHH Subtypes
  */
  enum pa_subtype_fhh_t {