summary history branches tags files
commit:9677a280166b605cf8e78dfb08c8166316641101
author:mrmekon
committer:mrmekon
date:Fri Nov 11 17:58:15 2011 -0500
parents:f512a4423fd6e8f6543af3e2fd5e5dba3dcc1993
Added unfinished autoconf support.

--HG--
rename : src/packet.h => src/simplepgp.h
diff --git a/Makefile.am b/Makefile.am
line changes: +4/-0
index 0000000..3254887
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,4 @@
+AUTOMAKE_OPTIONS = foreign
+
+
+SUBDIRS = src

diff --git a/configure.ac b/configure.ac
line changes: +63/-0
index 0000000..df111b8
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,63 @@
+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.68])
+AC_INIT([libsimplepgp], [1.0], [trevor@trevorbentley.com])
+AM_INIT_AUTOMAKE([libsimplepgp], [1.0])
+
+AC_COPYRIGHT(Apache License V2.0)
+
+AC_CONFIG_SRCDIR([gcrypt-module.h])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([Makefile])
+
+AC_PROG_LIBTOOL
+
+AC_CONFIG_MACRO_DIR([m4])
+
+# Checks for programs.
+AC_PROG_CC
+
+AC_ARG_WITH(zlib,
+  [  --with-zlib=DIR         use libz in DIR],[
+    if test -d "$withval"; then
+      CPPFLAGS="${CPPFLAGS} -I$withval/include"
+      LDFLAGS="${LDFLAGS} -L$withval/lib"
+    fi
+  ])
+
+AC_CHECK_HEADER(zlib.h,
+      AC_CHECK_LIB(z, inflateInit2_,
+       ZLIBS="-lz",
+       CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
+       CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
+
+# Checks for libraries.
+AC_CHECK_LIB([gcrypt],[gcry_md_open],[],[
+	echo "libgcrypt is required for this program"
+	exit -1])
+AC_CHECK_LIB([gpg-error],[gpg_err_init],[],[
+	echo "gpg-error is required for this program"
+	exit -1])
+AC_CHECK_LIB([z],[inflate],[],[
+	echo "zlib is required for this program"
+	exit -1])
+
+
+# Checks for header files.
+AC_CHECK_HEADERS([locale.h stddef.h stdint.h stdlib.h string.h sys/socket.h sys/time.h wchar.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT8_T
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([memmove memset setlocale])
+
+AC_OUTPUT

diff --git a/simplepgp.xcodeproj/project.pbxproj b/simplepgp.xcodeproj/project.pbxproj
line changes: +20/-12
index 8c55226..4ef9818
--- a/simplepgp.xcodeproj/project.pbxproj
+++ b/simplepgp.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
 		69269F2514620D0F00F69705 /* packet_test.c in Sources */ = {isa = PBXBuildFile; fileRef = 69269F2114620D0F00F69705 /* packet_test.c */; };
 		69269F2614620D0F00F69705 /* packet_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 69269F2214620D0F00F69705 /* packet_test.h */; };
 		69269F2714620D0F00F69705 /* packet.c in Sources */ = {isa = PBXBuildFile; fileRef = 69269F2314620D0F00F69705 /* packet.c */; };
-		69269F2814620D0F00F69705 /* packet.h in Headers */ = {isa = PBXBuildFile; fileRef = 69269F2414620D0F00F69705 /* packet.h */; };
 		6926A662146B38F200F69705 /* keychain.c in Sources */ = {isa = PBXBuildFile; fileRef = 6926A660146B38F200F69705 /* keychain.c */; };
 		6926A663146B38F200F69705 /* keychain.h in Headers */ = {isa = PBXBuildFile; fileRef = 6926A661146B38F200F69705 /* keychain.h */; };
 		6926A9BD146C608900F69705 /* libz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6926A9BC146C608900F69705 /* libz.a */; };
@@ -20,6 +19,7 @@
 		6926AD06146DC9BD00F69705 /* util.h in Headers */ = {isa = PBXBuildFile; fileRef = 6926AD01146DC9BD00F69705 /* util.h */; };
 		6926AD07146DC9BD00F69705 /* mpi.c in Sources */ = {isa = PBXBuildFile; fileRef = 6926AD02146DC9BD00F69705 /* mpi.c */; };
 		6926AD08146DC9BD00F69705 /* util.c in Sources */ = {isa = PBXBuildFile; fileRef = 6926AD03146DC9BD00F69705 /* util.c */; };
+		6926AD2C146DDA1900F69705 /* simplepgp.h in Headers */ = {isa = PBXBuildFile; fileRef = 6926AD2B146DDA1900F69705 /* simplepgp.h */; };
 		69868BC31460F343004C5D9B /* libgcrypt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69868BC21460F343004C5D9B /* libgcrypt.a */; };
 		69868BC51460F34A004C5D9B /* libgpg-error.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 69868BC41460F34A004C5D9B /* libgpg-error.a */; };
 		69868BC71460F37E004C5D9B /* gpg-error.h in Headers */ = {isa = PBXBuildFile; fileRef = 69868BC61460F37E004C5D9B /* gpg-error.h */; };
@@ -33,7 +33,6 @@
 		69269F2114620D0F00F69705 /* packet_test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = packet_test.c; path = src/packet_test.c; sourceTree = "<group>"; };
 		69269F2214620D0F00F69705 /* packet_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packet_test.h; path = src/packet_test.h; sourceTree = "<group>"; };
 		69269F2314620D0F00F69705 /* packet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = packet.c; path = src/packet.c; sourceTree = "<group>"; };
-		69269F2414620D0F00F69705 /* packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = packet.h; path = src/packet.h; sourceTree = "<group>"; };
 		6926A660146B38F200F69705 /* keychain.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = keychain.c; path = src/keychain.c; sourceTree = "<group>"; };
 		6926A661146B38F200F69705 /* keychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keychain.h; path = src/keychain.h; sourceTree = "<group>"; };
 		6926A9BC146C608900F69705 /* libz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libz.a; sourceTree = "<group>"; };
@@ -44,6 +43,7 @@
 		6926AD01146DC9BD00F69705 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = src/util.h; sourceTree = "<group>"; };
 		6926AD02146DC9BD00F69705 /* mpi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpi.c; path = src/mpi.c; sourceTree = "<group>"; };
 		6926AD03146DC9BD00F69705 /* util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = util.c; path = src/util.c; sourceTree = "<group>"; };
+		6926AD2B146DDA1900F69705 /* simplepgp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simplepgp.h; path = src/simplepgp.h; sourceTree = "<group>"; };
 		69868BC21460F343004C5D9B /* libgcrypt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgcrypt.a; sourceTree = "<group>"; };
 		69868BC41460F34A004C5D9B /* libgpg-error.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libgpg-error.a"; sourceTree = "<group>"; };
 		69868BC61460F37E004C5D9B /* gpg-error.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gpg-error.h"; sourceTree = "<group>"; };
@@ -81,7 +81,8 @@
 			isa = PBXGroup;
 			children = (
 				6926AC66146DBC7D00F69705 /* README */,
-				08FB77AEFE84172EC02AAC07 /* Classes */,
+				08FB77AEFE84172EC02AAC07 /* Source */,
+				6926AD1D146DCB1C00F69705 /* Headers */,
 				32C88DFF0371C24200C91783 /* Other Sources */,
 				0867D69AFE84028FC02AAC07 /* Frameworks */,
 				034768DFFF38A50411DB9C8B /* Products */,
@@ -100,22 +101,16 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		08FB77AEFE84172EC02AAC07 /* Classes */ = {
+		08FB77AEFE84172EC02AAC07 /* Source */ = {
 			isa = PBXGroup;
 			children = (
 				6926A660146B38F200F69705 /* keychain.c */,
-				6926A661146B38F200F69705 /* keychain.h */,
 				69269F2114620D0F00F69705 /* packet_test.c */,
-				69269F2214620D0F00F69705 /* packet_test.h */,
 				69269F2314620D0F00F69705 /* packet.c */,
-				69269F2414620D0F00F69705 /* packet.h */,
-				6926ACFF146DC9BD00F69705 /* mpi.h */,
-				6926AD00146DC9BD00F69705 /* packet_private.h */,
-				6926AD01146DC9BD00F69705 /* util.h */,
 				6926AD02146DC9BD00F69705 /* mpi.c */,
 				6926AD03146DC9BD00F69705 /* util.c */,
 			);
-			name = Classes;
+			name = Source;
 			sourceTree = "<group>";
 		};
 		32C88DFF0371C24200C91783 /* Other Sources */ = {
@@ -130,6 +125,19 @@
 			name = "Other Sources";
 			sourceTree = "<group>";
 		};
+		6926AD1D146DCB1C00F69705 /* Headers */ = {
+			isa = PBXGroup;
+			children = (
+				6926AD2B146DDA1900F69705 /* simplepgp.h */,
+				6926ACFF146DC9BD00F69705 /* mpi.h */,
+				6926AD00146DC9BD00F69705 /* packet_private.h */,
+				6926AD01146DC9BD00F69705 /* util.h */,
+				6926A661146B38F200F69705 /* keychain.h */,
+				69269F2214620D0F00F69705 /* packet_test.h */,
+			);
+			name = Headers;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -142,12 +150,12 @@
 				69868BCA1460F386004C5D9B /* gcrypt-module.h in Headers */,
 				69868BCB1460F386004C5D9B /* gcrypt.h in Headers */,
 				69269F2614620D0F00F69705 /* packet_test.h in Headers */,
-				69269F2814620D0F00F69705 /* packet.h in Headers */,
 				6926A663146B38F200F69705 /* keychain.h in Headers */,
 				6926A9BF146C609200F69705 /* zlib.h in Headers */,
 				6926AD04146DC9BD00F69705 /* mpi.h in Headers */,
 				6926AD05146DC9BD00F69705 /* packet_private.h in Headers */,
 				6926AD06146DC9BD00F69705 /* util.h in Headers */,
+				6926AD2C146DDA1900F69705 /* simplepgp.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/simplepgp.xcodeproj/trevor.mode1v3 b/simplepgp.xcodeproj/trevor.mode1v3
line changes: +37/-42
index a0cc37a..d7e413f
--- a/simplepgp.xcodeproj/trevor.mode1v3
+++ b/simplepgp.xcodeproj/trevor.mode1v3
@@ -265,6 +265,7 @@
 							<array>
 								<string>0867D691FE84028FC02AAC07</string>
 								<string>08FB77AEFE84172EC02AAC07</string>
+								<string>6926AD1D146DCB1C00F69705</string>
 								<string>32C88DFF0371C24200C91783</string>
 								<string>0867D69AFE84028FC02AAC07</string>
 								<string>AACBBE490F95108600F1A2B1</string>
@@ -274,8 +275,8 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>13</integer>
-									<integer>2</integer>
+									<integer>11</integer>
+									<integer>8</integer>
 									<integer>0</integer>
 								</array>
 							</array>
@@ -299,7 +300,7 @@
 							<real>186</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>-1645 546 1174 810 -1680 385 1680 1050 </string>
+						<string>-1643 546 1174 810 -1680 385 1680 1050 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -317,7 +318,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>util.c</string>
+								<string>packet_private.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -325,27 +326,28 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>util.c</string>
+										<string>packet_private.h</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>6926AD11146DC9D700F69705</string>
+										<string>6926AD46146DDA7900F69705</string>
 										<key>history</key>
 										<array>
-											<string>69868BD11460F42D004C5D9B</string>
 											<string>69868BD91460F468004C5D9B</string>
 											<string>69868C931460F7C3004C5D9B</string>
 											<string>69269F5214620FC500F69705</string>
-											<string>6926A9C7146C658300F69705</string>
-											<string>6926AA91146C83FA00F69705</string>
 											<string>6926ACA7146DC70D00F69705</string>
 											<string>6926ACA8146DC70D00F69705</string>
 											<string>6926ACAA146DC70D00F69705</string>
-											<string>6926ACD7146DC8A000F69705</string>
 											<string>6926ACD8146DC8A000F69705</string>
-											<string>6926ACF0146DC91F00F69705</string>
 											<string>6926AD0F146DC9D700F69705</string>
-											<string>6926AD10146DC9D700F69705</string>
+											<string>6926AD1F146DCB4800F69705</string>
+											<string>6926AD20146DCB4800F69705</string>
+											<string>6926AD42146DDA7900F69705</string>
+											<string>6926AD43146DDA7900F69705</string>
+											<string>6926AD44146DDA7900F69705</string>
+											<string>6926AD45146DDA7900F69705</string>
+											<string>6926AD1E146DCB4800F69705</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -359,7 +361,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {966, 675}}</string>
 								<key>RubberWindowFrame</key>
-								<string>-1645 546 1174 810 -1680 385 1680 1050 </string>
+								<string>-1643 546 1174 810 -1680 385 1680 1050 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -379,7 +381,7 @@
 								<key>Frame</key>
 								<string>{{0, 680}, {966, 89}}</string>
 								<key>RubberWindowFrame</key>
-								<string>-1645 546 1174 810 -1680 385 1680 1050 </string>
+								<string>-1643 546 1174 810 -1680 385 1680 1050 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
@@ -543,12 +545,13 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>1C530D57069F1CE1000CFCEE</string>
 		<string>1CD10A99069EF8BA00B06720</string>
 		<string>69868B2D1460E71D004C5D9B</string>
 		<string>/Users/trevor/Documents/Cocoa Projects/libsimplepgp/simplepgp.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>-1645 546 1174 810 -1680 385 1680 1050 </string>
+	<string>-1643 546 1174 810 -1680 385 1680 1050 </string>
 	<key>WindowToolsV3</key>
 	<array>
 		<dict>
@@ -767,8 +770,12 @@
 			<false/>
 		</dict>
 		<dict>
+			<key>FirstTimeWindowDisplayed</key>
+			<false/>
 			<key>Identifier</key>
 			<string>windowTool.find</string>
+			<key>IsVertical</key>
+			<true/>
 			<key>Layout</key>
 			<array>
 				<dict>
@@ -783,26 +790,16 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CDD528C0622207200134675</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>&lt;No Editor&gt;</string>
-										<key>PBXSplitModuleInNavigatorKey</key>
-										<dict>
-											<key>Split0</key>
-											<dict>
-												<key>PBXProjectModuleGUID</key>
-												<string>1CD0528D0623707200166675</string>
-											</dict>
-											<key>SplitCount</key>
-											<string>1</string>
-										</dict>
+										<string></string>
 										<key>StatusBarVisibility</key>
-										<integer>1</integer>
+										<true/>
 									</dict>
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{0, 0}, {781, 167}}</string>
+										<string>{{0, 0}, {781, 212}}</string>
 										<key>RubberWindowFrame</key>
-										<string>62 385 781 470 0 0 1440 878 </string>
+										<string>-892 941 781 470 -1680 385 1680 1050 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXNavigatorGroup</string>
@@ -811,11 +808,11 @@
 								</dict>
 							</array>
 							<key>Proportion</key>
-							<string>50%</string>
+							<string>212pt</string>
 						</dict>
 						<dict>
 							<key>BecomeActive</key>
-							<integer>1</integer>
+							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
@@ -826,18 +823,18 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{8, 0}, {773, 254}}</string>
+								<string>{{0, 217}, {781, 212}}</string>
 								<key>RubberWindowFrame</key>
-								<string>62 385 781 470 0 0 1440 878 </string>
+								<string>-892 941 781 470 -1680 385 1680 1050 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXProjectFindModule</string>
 							<key>Proportion</key>
-							<string>50%</string>
+							<string>212pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>428pt</string>
+					<string>429pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -847,23 +844,21 @@
 				<string>PBXProjectFindModule</string>
 			</array>
 			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
+			<true/>
 			<key>TableOfContents</key>
 			<array>
 				<string>1C530D57069F1CE1000CFCEE</string>
-				<string>1C530D58069F1CE1000CFCEE</string>
-				<string>1C530D59069F1CE1000CFCEE</string>
+				<string>6926AD30146DDA4700F69705</string>
+				<string>6926AD31146DDA4700F69705</string>
 				<string>1CDD528C0622207200134675</string>
-				<string>1C530D5A069F1CE1000CFCEE</string>
-				<string>1CE0B1FE06471DED0097A5F4</string>
 				<string>1CD0528E0623707200166675</string>
 			</array>
 			<key>WindowString</key>
-			<string>62 385 781 470 0 0 1440 878 </string>
+			<string>-892 941 781 470 -1680 385 1680 1050 </string>
 			<key>WindowToolGUID</key>
 			<string>1C530D57069F1CE1000CFCEE</string>
 			<key>WindowToolIsVisible</key>
-			<integer>0</integer>
+			<false/>
 		</dict>
 		<dict>
 			<key>Identifier</key>

diff --git a/simplepgp.xcodeproj/trevor.pbxuser b/simplepgp.xcodeproj/trevor.pbxuser
line changes: +408/-243
index 3dd5d78..d50f372
--- a/simplepgp.xcodeproj/trevor.pbxuser
+++ b/simplepgp.xcodeproj/trevor.pbxuser
@@ -1,7 +1,9 @@
 // !$*UTF8*$!
 {
 	0867D690FE84028FC02AAC07 /* Project object */ = {
+		activeArchitecturePreference = armv7;
 		activeBuildConfigurationName = Debug;
+		activeSDKPreference = iphonesimulator4.3;
 		activeTarget = D2AAC07D0554694100DB518D /* simplepgp */;
 		addToTargets = (
 			D2AAC07D0554694100DB518D /* simplepgp */,
@@ -400,6 +402,19 @@
 			6926AD0F146DC9D700F69705 /* PBXTextBookmark */ = 6926AD0F146DC9D700F69705 /* PBXTextBookmark */;
 			6926AD10146DC9D700F69705 /* PBXBookmark */ = 6926AD10146DC9D700F69705 /* PBXBookmark */;
 			6926AD11146DC9D700F69705 /* PBXTextBookmark */ = 6926AD11146DC9D700F69705 /* PBXTextBookmark */;
+			6926AD1E146DCB4800F69705 /* PBXTextBookmark */ = 6926AD1E146DCB4800F69705 /* PBXTextBookmark */;
+			6926AD1F146DCB4800F69705 /* PBXTextBookmark */ = 6926AD1F146DCB4800F69705 /* PBXTextBookmark */;
+			6926AD20146DCB4800F69705 /* PBXTextBookmark */ = 6926AD20146DCB4800F69705 /* PBXTextBookmark */;
+			6926AD21146DCB4800F69705 /* PBXTextBookmark */ = 6926AD21146DCB4800F69705 /* PBXTextBookmark */;
+			6926AD22146DCB4800F69705 /* PBXTextBookmark */ = 6926AD22146DCB4800F69705 /* PBXTextBookmark */;
+			6926AD23146DCB4800F69705 /* PBXTextBookmark */ = 6926AD23146DCB4800F69705 /* PBXTextBookmark */;
+			6926AD2A146DCE7600F69705 /* PBXTextBookmark */ = 6926AD2A146DCE7600F69705 /* PBXTextBookmark */;
+			6926AD2F146DDA4700F69705 /* PBXTextBookmark */ = 6926AD2F146DDA4700F69705 /* PBXTextBookmark */;
+			6926AD42146DDA7900F69705 /* PBXTextBookmark */ = 6926AD42146DDA7900F69705 /* PBXTextBookmark */;
+			6926AD43146DDA7900F69705 /* PBXTextBookmark */ = 6926AD43146DDA7900F69705 /* PBXTextBookmark */;
+			6926AD44146DDA7900F69705 /* PBXTextBookmark */ = 6926AD44146DDA7900F69705 /* PBXTextBookmark */;
+			6926AD45146DDA7900F69705 /* PBXTextBookmark */ = 6926AD45146DDA7900F69705 /* PBXTextBookmark */;
+			6926AD46146DDA7900F69705 /* PBXTextBookmark */ = 6926AD46146DDA7900F69705 /* PBXTextBookmark */;
 			69868BD11460F42D004C5D9B = 69868BD11460F42D004C5D9B /* PBXTextBookmark */;
 			69868BD91460F468004C5D9B = 69868BD91460F468004C5D9B /* PBXTextBookmark */;
 			69868C931460F7C3004C5D9B = 69868C931460F7C3004C5D9B /* PBXTextBookmark */;
@@ -424,13 +439,19 @@
 	};
 	69269F2314620D0F00F69705 /* packet.c */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {905, 21710}}";
-			sepNavSelRange = "{78, 606}";
-			sepNavVisRange = "{0, 1153}";
+			sepNavIntBoundsRect = "{{0, 0}, {509, 21346}}";
+			sepNavSelRange = "{47236, 0}";
+			sepNavVisRange = "{37622, 261}";
 			sepNavWindowFrame = "{{139, 11}, {1136, 746}}";
 		};
 	};
 	69269F2414620D0F00F69705 /* packet.h */ = {
+		isa = PBXFileReference;
+		fileEncoding = 4;
+		lastKnownFileType = sourcecode.c.h;
+		name = packet.h;
+		path = "/Users/trevor/Documents/Cocoa Projects/libsimplepgp/src/packet.h";
+		sourceTree = "<absolute>";
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {905, 1157}}";
 			sepNavSelRange = "{81, 603}";
@@ -510,7 +531,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 816";
 		rLen = 0;
-		rLoc = 29058;
+		rLoc = 29061;
 		rType = 0;
 		vrLen = 1446;
 		vrLoc = 24434;
@@ -520,7 +541,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 820";
 		rLen = 0;
-		rLoc = 29226;
+		rLoc = 29229;
 		rType = 0;
 		vrLen = 1479;
 		vrLoc = 24016;
@@ -530,7 +551,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 791";
 		rLen = 0;
-		rLoc = 28225;
+		rLoc = 28228;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 27306;
@@ -540,7 +561,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 179";
 		rLen = 0;
-		rLoc = 6086;
+		rLoc = 6089;
 		rType = 0;
 		vrLen = 1966;
 		vrLoc = 4084;
@@ -550,7 +571,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 960";
 		rLen = 0;
-		rLoc = 50823;
+		rLoc = 50826;
 		rType = 0;
 		vrLen = 1655;
 		vrLoc = 28491;
@@ -560,7 +581,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 975";
 		rLen = 0;
-		rLoc = 50823;
+		rLoc = 50826;
 		rType = 0;
 		vrLen = 1799;
 		vrLoc = 28668;
@@ -570,7 +591,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 974";
 		rLen = 0;
-		rLoc = 50823;
+		rLoc = 50826;
 		rType = 0;
 		vrLen = 1802;
 		vrLoc = 28668;
@@ -580,7 +601,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 672";
 		rLen = 0;
-		rLoc = 23993;
+		rLoc = 23996;
 		rType = 0;
 		vrLen = 2232;
 		vrLoc = 19150;
@@ -590,7 +611,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 672";
 		rLen = 0;
-		rLoc = 23993;
+		rLoc = 23996;
 		rType = 0;
 		vrLen = 2232;
 		vrLoc = 19150;
@@ -600,7 +621,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 671";
 		rLen = 0;
-		rLoc = 23951;
+		rLoc = 23954;
 		rType = 0;
 		vrLen = 2244;
 		vrLoc = 19150;
@@ -610,7 +631,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 729";
 		rLen = 0;
-		rLoc = 25914;
+		rLoc = 25917;
 		rType = 0;
 		vrLen = 2063;
 		vrLoc = 21499;
@@ -620,7 +641,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 251";
 		rLen = 0;
-		rLoc = 7999;
+		rLoc = 8002;
 		rType = 0;
 		vrLen = 1791;
 		vrLoc = 6607;
@@ -650,7 +671,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 233";
 		rLen = 0;
-		rLoc = 7680;
+		rLoc = 7683;
 		rType = 0;
 		vrLen = 1575;
 		vrLoc = 6539;
@@ -660,7 +681,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 233";
 		rLen = 0;
-		rLoc = 7680;
+		rLoc = 7683;
 		rType = 0;
 		vrLen = 1575;
 		vrLoc = 6539;
@@ -680,7 +701,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 325";
 		rLen = 0;
-		rLoc = 11671;
+		rLoc = 11674;
 		rType = 0;
 		vrLen = 1425;
 		vrLoc = 8435;
@@ -690,7 +711,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 243";
 		rLen = 0;
-		rLoc = 8146;
+		rLoc = 8149;
 		rType = 0;
 		vrLen = 1663;
 		vrLoc = 6777;
@@ -700,7 +721,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 226";
 		rLen = 0;
-		rLoc = 7891;
+		rLoc = 7894;
 		rType = 0;
 		vrLen = 1673;
 		vrLoc = 6472;
@@ -720,7 +741,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 181";
 		rLen = 1;
-		rLoc = 6438;
+		rLoc = 6441;
 		rType = 0;
 		vrLen = 1900;
 		vrLoc = 4533;
@@ -730,7 +751,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 959";
 		rLen = 0;
-		rLoc = 44805;
+		rLoc = 44808;
 		rType = 0;
 		vrLen = 1765;
 		vrLoc = 29422;
@@ -740,7 +761,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 969";
 		rLen = 0;
-		rLoc = 45287;
+		rLoc = 45290;
 		rType = 0;
 		vrLen = 1684;
 		vrLoc = 29422;
@@ -760,7 +781,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 977";
 		rLen = 0;
-		rLoc = 45589;
+		rLoc = 45592;
 		rType = 0;
 		vrLen = 1601;
 		vrLoc = 29516;
@@ -770,7 +791,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 977";
 		rLen = 0;
-		rLoc = 45589;
+		rLoc = 45592;
 		rType = 0;
 		vrLen = 1598;
 		vrLoc = 29516;
@@ -780,7 +801,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 959";
 		rLen = 0;
-		rLoc = 44766;
+		rLoc = 44769;
 		rType = 0;
 		vrLen = 1633;
 		vrLoc = 29516;
@@ -790,7 +811,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 974";
 		rLen = 0;
-		rLoc = 45255;
+		rLoc = 45258;
 		rType = 0;
 		vrLen = 1643;
 		vrLoc = 29261;
@@ -800,7 +821,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 984";
 		rLen = 0;
-		rLoc = 45565;
+		rLoc = 45568;
 		rType = 0;
 		vrLen = 1637;
 		vrLoc = 29261;
@@ -810,7 +831,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 993";
 		rLen = 0;
-		rLoc = 46315;
+		rLoc = 46318;
 		rType = 0;
 		vrLen = 1784;
 		vrLoc = 30278;
@@ -830,7 +851,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 993";
 		rLen = 0;
-		rLoc = 46315;
+		rLoc = 46318;
 		rType = 0;
 		vrLen = 1784;
 		vrLoc = 30278;
@@ -840,7 +861,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 993";
 		rLen = 0;
-		rLoc = 46315;
+		rLoc = 46318;
 		rType = 0;
 		vrLen = 1847;
 		vrLoc = 30172;
@@ -860,7 +881,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 990";
 		rLen = 0;
-		rLoc = 45680;
+		rLoc = 45683;
 		rType = 0;
 		vrLen = 1796;
 		vrLoc = 29921;
@@ -870,7 +891,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1025";
 		rLen = 0;
-		rLoc = 49297;
+		rLoc = 49300;
 		rType = 0;
 		vrLen = 1708;
 		vrLoc = 30610;
@@ -890,7 +911,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1025";
 		rLen = 0;
-		rLoc = 49273;
+		rLoc = 49276;
 		rType = 0;
 		vrLen = 1740;
 		vrLoc = 30610;
@@ -900,7 +921,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1002";
 		rLen = 0;
-		rLoc = 45990;
+		rLoc = 45993;
 		rType = 0;
 		vrLen = 1864;
 		vrLoc = 29944;
@@ -920,7 +941,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1001";
 		rLen = 0;
-		rLoc = 45989;
+		rLoc = 45992;
 		rType = 0;
 		vrLen = 1801;
 		vrLoc = 30007;
@@ -930,7 +951,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 249";
 		rLen = 0;
-		rLoc = 7999;
+		rLoc = 8002;
 		rType = 0;
 		vrLen = 1363;
 		vrLoc = 6644;
@@ -954,7 +975,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 50";
 		rLen = 0;
-		rLoc = 1050;
+		rLoc = 1053;
 		rType = 0;
 		vrLen = 1332;
 		vrLoc = 30243;
@@ -984,7 +1005,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 17";
 		rLen = 18;
-		rLoc = 781;
+		rLoc = 784;
 		rType = 0;
 		vrLen = 621;
 		vrLoc = 0;
@@ -994,7 +1015,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 17";
 		rLen = 18;
-		rLoc = 781;
+		rLoc = 784;
 		rType = 0;
 		vrLen = 621;
 		vrLoc = 0;
@@ -1004,7 +1025,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 16";
 		rLen = 0;
-		rLoc = 772;
+		rLoc = 775;
 		rType = 0;
 		vrLen = 621;
 		vrLoc = 0;
@@ -1014,7 +1035,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 49";
 		rLen = 25;
-		rLoc = 1116;
+		rLoc = 1119;
 		rType = 0;
 		vrLen = 1196;
 		vrLoc = 262;
@@ -1064,7 +1085,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 16";
 		rLen = 0;
-		rLoc = 772;
+		rLoc = 775;
 		rType = 0;
 		vrLen = 621;
 		vrLoc = 0;
@@ -1094,7 +1115,7 @@
 		fRef = 6926A661146B38F200F69705 /* keychain.h */;
 		name = "keychain.h: 19";
 		rLen = 0;
-		rLoc = 878;
+		rLoc = 881;
 		rType = 0;
 		vrLen = 659;
 		vrLoc = 0;
@@ -1114,7 +1135,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 90";
 		rLen = 0;
-		rLoc = 3996;
+		rLoc = 3999;
 		rType = 0;
 		vrLen = 1411;
 		vrLoc = 30330;
@@ -1164,7 +1185,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 90";
 		rLen = 0;
-		rLoc = 3996;
+		rLoc = 3999;
 		rType = 0;
 		vrLen = 1432;
 		vrLoc = 31262;
@@ -1174,7 +1195,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 90";
 		rLen = 0;
-		rLoc = 3996;
+		rLoc = 3999;
 		rType = 0;
 		vrLen = 1432;
 		vrLoc = 31262;
@@ -1184,7 +1205,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49154;
+		rLoc = 49157;
 		rType = 0;
 		vrLen = 1444;
 		vrLoc = 31262;
@@ -1194,7 +1215,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49154;
+		rLoc = 49157;
 		rType = 0;
 		vrLen = 1444;
 		vrLoc = 31262;
@@ -1204,7 +1225,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49154;
+		rLoc = 49157;
 		rType = 0;
 		vrLen = 1444;
 		vrLoc = 31262;
@@ -1214,7 +1235,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49154;
+		rLoc = 49157;
 		rType = 0;
 		vrLen = 1453;
 		vrLoc = 31262;
@@ -1224,7 +1245,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 49154;
+		rLoc = 49157;
 		rType = 0;
 		vrLen = 1453;
 		vrLoc = 31262;
@@ -1254,7 +1275,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1046";
 		rLen = 0;
-		rLoc = 49154;
+		rLoc = 49157;
 		rType = 0;
 		vrLen = 1450;
 		vrLoc = 31285;
@@ -1264,7 +1285,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 49077;
+		rLoc = 49080;
 		rType = 0;
 		vrLen = 1450;
 		vrLoc = 31285;
@@ -1274,7 +1295,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 49077;
+		rLoc = 49080;
 		rType = 0;
 		vrLen = 1450;
 		vrLoc = 31285;
@@ -1284,7 +1305,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1048";
 		rLen = 0;
-		rLoc = 49046;
+		rLoc = 49049;
 		rType = 0;
 		vrLen = 1333;
 		vrLoc = 31285;
@@ -1304,7 +1325,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1226";
 		rLen = 0;
-		rLoc = 50824;
+		rLoc = 50827;
 		rType = 0;
 		vrLen = 1307;
 		vrLoc = 36795;
@@ -1314,7 +1335,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1034";
 		rLen = 0;
-		rLoc = 47042;
+		rLoc = 47045;
 		rType = 0;
 		vrLen = 1205;
 		vrLoc = 30973;
@@ -1324,7 +1345,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 46854;
+		rLoc = 46857;
 		rType = 0;
 		vrLen = 1408;
 		vrLoc = 30775;
@@ -1344,7 +1365,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 46473;
+		rLoc = 46476;
 		rType = 0;
 		vrLen = 1492;
 		vrLoc = 31248;
@@ -1354,7 +1375,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 46949;
+		rLoc = 46952;
 		rType = 0;
 		vrLen = 1462;
 		vrLoc = 31147;
@@ -1364,7 +1385,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1048";
 		rLen = 0;
-		rLoc = 47171;
+		rLoc = 47174;
 		rType = 0;
 		vrLen = 1462;
 		vrLoc = 31147;
@@ -1374,7 +1395,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1049";
 		rLen = 0;
-		rLoc = 47115;
+		rLoc = 47118;
 		rType = 0;
 		vrLen = 1394;
 		vrLoc = 31415;
@@ -1384,7 +1405,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1049";
 		rLen = 0;
-		rLoc = 47115;
+		rLoc = 47118;
 		rType = 0;
 		vrLen = 1394;
 		vrLoc = 31415;
@@ -1394,7 +1415,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1029";
 		rLen = 0;
-		rLoc = 46340;
+		rLoc = 46343;
 		rType = 0;
 		vrLen = 1498;
 		vrLoc = 30842;
@@ -1404,7 +1425,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 46417;
+		rLoc = 46420;
 		rType = 0;
 		vrLen = 1502;
 		vrLoc = 30842;
@@ -1414,7 +1435,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 46417;
+		rLoc = 46420;
 		rType = 0;
 		vrLen = 1508;
 		vrLoc = 30842;
@@ -1434,7 +1455,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 970";
 		rLen = 119;
-		rLoc = 44403;
+		rLoc = 44406;
 		rType = 0;
 		vrLen = 1389;
 		vrLoc = 31415;
@@ -1444,7 +1465,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1250";
 		rLen = 0;
-		rLoc = 50824;
+		rLoc = 50827;
 		rType = 0;
 		vrLen = 1185;
 		vrLoc = 37615;
@@ -1454,7 +1475,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1250";
 		rLen = 0;
-		rLoc = 50824;
+		rLoc = 50827;
 		rType = 0;
 		vrLen = 1185;
 		vrLoc = 37619;
@@ -1464,7 +1485,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1039";
 		rLen = 0;
-		rLoc = 46701;
+		rLoc = 46704;
 		rType = 0;
 		vrLen = 1356;
 		vrLoc = 31419;
@@ -1474,7 +1495,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1064";
 		rLen = 0;
-		rLoc = 47553;
+		rLoc = 47556;
 		rType = 0;
 		vrLen = 1461;
 		vrLoc = 31857;
@@ -1484,7 +1505,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1062";
 		rLen = 0;
-		rLoc = 47413;
+		rLoc = 47416;
 		rType = 0;
 		vrLen = 1476;
 		vrLoc = 31764;
@@ -1503,7 +1524,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 978";
 		rLen = 0;
-		rLoc = 44737;
+		rLoc = 44740;
 		rType = 0;
 		vrLen = 1540;
 		vrLoc = 31881;
@@ -1513,7 +1534,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1064";
 		rLen = 0;
-		rLoc = 47553;
+		rLoc = 47556;
 		rType = 0;
 		vrLen = 1532;
 		vrLoc = 31881;
@@ -1533,7 +1554,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1065";
 		rLen = 0;
-		rLoc = 47540;
+		rLoc = 47543;
 		rType = 0;
 		vrLen = 1532;
 		vrLoc = 31881;
@@ -1543,7 +1564,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 47829;
+		rLoc = 47832;
 		rType = 0;
 		vrLen = 1453;
 		vrLoc = 31881;
@@ -1553,7 +1574,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1071";
 		rLen = 0;
-		rLoc = 47865;
+		rLoc = 47868;
 		rType = 0;
 		vrLen = 1532;
 		vrLoc = 31881;
@@ -1563,7 +1584,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 47704;
+		rLoc = 47707;
 		rType = 0;
 		vrLen = 1612;
 		vrLoc = 31913;
@@ -1583,7 +1604,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1067";
 		rLen = 0;
-		rLoc = 47595;
+		rLoc = 47598;
 		rType = 0;
 		vrLen = 1555;
 		vrLoc = 31987;
@@ -1593,7 +1614,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1067";
 		rLen = 0;
-		rLoc = 47595;
+		rLoc = 47598;
 		rType = 0;
 		vrLen = 1555;
 		vrLoc = 31987;
@@ -1603,7 +1624,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1073";
 		rLen = 0;
-		rLoc = 47871;
+		rLoc = 47874;
 		rType = 0;
 		vrLen = 1560;
 		vrLoc = 31987;
@@ -1623,7 +1644,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1073";
 		rLen = 0;
-		rLoc = 47871;
+		rLoc = 47874;
 		rType = 0;
 		vrLen = 1560;
 		vrLoc = 31987;
@@ -1633,7 +1654,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1075";
 		rLen = 0;
-		rLoc = 47945;
+		rLoc = 47948;
 		rType = 0;
 		vrLen = 1486;
 		vrLoc = 31987;
@@ -1643,7 +1664,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1086";
 		rLen = 0;
-		rLoc = 48305;
+		rLoc = 48308;
 		rType = 0;
 		vrLen = 1581;
 		vrLoc = 32939;
@@ -1653,7 +1674,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1088";
 		rLen = 0;
-		rLoc = 48305;
+		rLoc = 48308;
 		rType = 0;
 		vrLen = 1636;
 		vrLoc = 32363;
@@ -1663,7 +1684,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1088";
 		rLen = 0;
-		rLoc = 48305;
+		rLoc = 48308;
 		rType = 0;
 		vrLen = 1637;
 		vrLoc = 32362;
@@ -1673,7 +1694,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1089";
 		rLen = 0;
-		rLoc = 48305;
+		rLoc = 48308;
 		rType = 0;
 		vrLen = 1647;
 		vrLoc = 32362;
@@ -1683,7 +1704,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48359;
+		rLoc = 48362;
 		rType = 0;
 		vrLen = 1651;
 		vrLoc = 32366;
@@ -1693,7 +1714,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48359;
+		rLoc = 48362;
 		rType = 0;
 		vrLen = 1651;
 		vrLoc = 32366;
@@ -1703,7 +1724,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48359;
+		rLoc = 48362;
 		rType = 0;
 		vrLen = 1658;
 		vrLoc = 32366;
@@ -1713,7 +1734,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48359;
+		rLoc = 48362;
 		rType = 0;
 		vrLen = 1658;
 		vrLoc = 32366;
@@ -1723,7 +1744,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 48359;
+		rLoc = 48362;
 		rType = 0;
 		vrLen = 1543;
 		vrLoc = 32544;
@@ -1733,7 +1754,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1096";
 		rLen = 0;
-		rLoc = 48512;
+		rLoc = 48515;
 		rType = 0;
 		vrLen = 1484;
 		vrLoc = 32775;
@@ -1743,7 +1764,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 438";
 		rLen = 0;
-		rLoc = 16801;
+		rLoc = 16804;
 		rType = 0;
 		vrLen = 1856;
 		vrLoc = 11348;
@@ -1753,7 +1774,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 438";
 		rLen = 0;
-		rLoc = 16801;
+		rLoc = 16804;
 		rType = 0;
 		vrLen = 1886;
 		vrLoc = 11348;
@@ -1763,7 +1784,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 438";
 		rLen = 0;
-		rLoc = 16801;
+		rLoc = 16804;
 		rType = 0;
 		vrLen = 1864;
 		vrLoc = 11538;
@@ -1773,7 +1794,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 438";
 		rLen = 0;
-		rLoc = 16801;
+		rLoc = 16804;
 		rType = 0;
 		vrLen = 1858;
 		vrLoc = 11538;
@@ -1783,7 +1804,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 470";
 		rLen = 0;
-		rLoc = 17911;
+		rLoc = 17914;
 		rType = 0;
 		vrLen = 1250;
 		vrLoc = 13332;
@@ -1803,7 +1824,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 444";
 		rLen = 0;
-		rLoc = 16801;
+		rLoc = 16804;
 		rType = 0;
 		vrLen = 1464;
 		vrLoc = 12557;
@@ -1813,7 +1834,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1862;
+		rLoc = 1865;
 		rType = 0;
 		vrLen = 1528;
 		vrLoc = 12678;
@@ -1823,7 +1844,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1862;
+		rLoc = 1865;
 		rType = 0;
 		vrLen = 1528;
 		vrLoc = 12678;
@@ -1833,7 +1854,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1862;
+		rLoc = 1865;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 12678;
@@ -1843,7 +1864,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1862;
+		rLoc = 1865;
 		rType = 0;
 		vrLen = 1530;
 		vrLoc = 12679;
@@ -1853,7 +1874,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 68";
 		rLen = 0;
-		rLoc = 1862;
+		rLoc = 1865;
 		rType = 0;
 		vrLen = 1530;
 		vrLoc = 12679;
@@ -1883,7 +1904,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 139";
 		rLen = 54;
-		rLoc = 4770;
+		rLoc = 4773;
 		rType = 0;
 		vrLen = 1692;
 		vrLoc = 5114;
@@ -1893,7 +1914,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1012";
 		rLen = 0;
-		rLoc = 42237;
+		rLoc = 42240;
 		rType = 0;
 		vrLen = 1382;
 		vrLoc = 30008;
@@ -1903,7 +1924,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1007";
 		rLen = 0;
-		rLoc = 38335;
+		rLoc = 38338;
 		rType = 0;
 		vrLen = 1403;
 		vrLoc = 30374;
@@ -1913,7 +1934,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1017";
 		rLen = 0;
-		rLoc = 38720;
+		rLoc = 38723;
 		rType = 0;
 		vrLen = 1491;
 		vrLoc = 30915;
@@ -1933,7 +1954,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1017";
 		rLen = 0;
-		rLoc = 38752;
+		rLoc = 38755;
 		rType = 0;
 		vrLen = 1495;
 		vrLoc = 30915;
@@ -1943,7 +1964,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1012";
 		rLen = 0;
-		rLoc = 38498;
+		rLoc = 38501;
 		rType = 0;
 		vrLen = 1481;
 		vrLoc = 30905;
@@ -1953,7 +1974,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1040";
 		rLen = 0;
-		rLoc = 39711;
+		rLoc = 39714;
 		rType = 0;
 		vrLen = 1427;
 		vrLoc = 30905;
@@ -1973,7 +1994,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 42237;
+		rLoc = 42240;
 		rType = 0;
 		vrLen = 1420;
 		vrLoc = 30908;
@@ -1983,7 +2004,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1050";
 		rLen = 119;
-		rLoc = 44403;
+		rLoc = 44406;
 		rType = 0;
 		vrLen = 1509;
 		vrLoc = 31655;
@@ -2003,7 +2024,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1058";
 		rLen = 0;
-		rLoc = 44237;
+		rLoc = 44240;
 		rType = 0;
 		vrLen = 1317;
 		vrLoc = 32232;
@@ -2013,7 +2034,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1062";
 		rLen = 0;
-		rLoc = 44384;
+		rLoc = 44387;
 		rType = 0;
 		vrLen = 1285;
 		vrLoc = 32232;
@@ -2023,7 +2044,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1030";
 		rLen = 0;
-		rLoc = 38902;
+		rLoc = 38905;
 		rType = 0;
 		vrLen = 1417;
 		vrLoc = 31218;
@@ -2033,7 +2054,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1030";
 		rLen = 0;
-		rLoc = 38902;
+		rLoc = 38905;
 		rType = 0;
 		vrLen = 1417;
 		vrLoc = 31218;
@@ -2043,7 +2064,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 38902;
+		rLoc = 38905;
 		rType = 0;
 		vrLen = 1392;
 		vrLoc = 31253;
@@ -2053,7 +2074,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 38902;
+		rLoc = 38905;
 		rType = 0;
 		vrLen = 1392;
 		vrLoc = 31253;
@@ -2063,7 +2084,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1032";
 		rLen = 0;
-		rLoc = 38902;
+		rLoc = 38905;
 		rType = 0;
 		vrLen = 1451;
 		vrLoc = 31194;
@@ -2073,7 +2094,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 436";
 		rLen = 0;
-		rLoc = 17018;
+		rLoc = 17021;
 		rType = 0;
 		vrLen = 1818;
 		vrLoc = 11735;
@@ -2083,7 +2104,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 436";
 		rLen = 0;
-		rLoc = 17018;
+		rLoc = 17021;
 		rType = 0;
 		vrLen = 1451;
 		vrLoc = 12773;
@@ -2093,7 +2114,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 437";
 		rLen = 0;
-		rLoc = 17024;
+		rLoc = 17027;
 		rType = 0;
 		vrLen = 1519;
 		vrLoc = 12550;
@@ -2103,7 +2124,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 437";
 		rLen = 0;
-		rLoc = 17024;
+		rLoc = 17027;
 		rType = 0;
 		vrLen = 1523;
 		vrLoc = 12550;
@@ -2113,7 +2134,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 437";
 		rLen = 0;
-		rLoc = 17024;
+		rLoc = 17027;
 		rType = 0;
 		vrLen = 1519;
 		vrLoc = 12550;
@@ -2123,7 +2144,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 437";
 		rLen = 0;
-		rLoc = 17024;
+		rLoc = 17027;
 		rType = 0;
 		vrLen = 1519;
 		vrLoc = 12550;
@@ -2133,7 +2154,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41360;
+		rLoc = 41363;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 31834;
@@ -2143,7 +2164,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41360;
+		rLoc = 41363;
 		rType = 0;
 		vrLen = 1529;
 		vrLoc = 31834;
@@ -2153,7 +2174,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41360;
+		rLoc = 41363;
 		rType = 0;
 		vrLen = 1635;
 		vrLoc = 31881;
@@ -2163,7 +2184,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41360;
+		rLoc = 41363;
 		rType = 0;
 		vrLen = 1635;
 		vrLoc = 31881;
@@ -2173,7 +2194,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1074";
 		rLen = 0;
-		rLoc = 41360;
+		rLoc = 41363;
 		rType = 0;
 		vrLen = 1634;
 		vrLoc = 31881;
@@ -2183,7 +2204,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 454";
 		rLen = 0;
-		rLoc = 17461;
+		rLoc = 17464;
 		rType = 0;
 		vrLen = 1502;
 		vrLoc = 12734;
@@ -2193,7 +2214,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1076";
 		rLen = 0;
-		rLoc = 40383;
+		rLoc = 40386;
 		rType = 0;
 		vrLen = 1580;
 		vrLoc = 32022;
@@ -2213,7 +2234,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 41631;
+		rLoc = 41634;
 		rType = 0;
 		vrLen = 1776;
 		vrLoc = 32146;
@@ -2223,7 +2244,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 177";
 		rLen = 0;
-		rLoc = 5476;
+		rLoc = 5479;
 		rType = 0;
 		vrLen = 1558;
 		vrLoc = 5039;
@@ -2233,7 +2254,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 210";
 		rLen = 0;
-		rLoc = 6508;
+		rLoc = 6511;
 		rType = 0;
 		vrLen = 1859;
 		vrLoc = 5449;
@@ -2243,7 +2264,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1020";
 		rLen = 211;
-		rLoc = 38031;
+		rLoc = 38034;
 		rType = 0;
 		vrLen = 1580;
 		vrLoc = 33567;
@@ -2253,7 +2274,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1020";
 		rLen = 211;
-		rLoc = 38031;
+		rLoc = 38034;
 		rType = 0;
 		vrLen = 1580;
 		vrLoc = 33567;
@@ -2263,7 +2284,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1119";
 		rLen = 0;
-		rLoc = 42018;
+		rLoc = 42021;
 		rType = 0;
 		vrLen = 1634;
 		vrLoc = 33895;
@@ -2273,7 +2294,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1070";
 		rLen = 0;
-		rLoc = 39711;
+		rLoc = 39714;
 		rType = 0;
 		vrLen = 1725;
 		vrLoc = 32525;
@@ -2283,7 +2304,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 16";
 		rLen = 0;
-		rLoc = 856;
+		rLoc = 859;
 		rType = 0;
 		vrLen = 975;
 		vrLoc = 0;
@@ -2293,7 +2314,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1037";
 		rLen = 0;
-		rLoc = 38002;
+		rLoc = 38005;
 		rType = 0;
 		vrLen = 1329;
 		vrLoc = 31486;
@@ -2303,7 +2324,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1041";
 		rLen = 0;
-		rLoc = 37619;
+		rLoc = 37622;
 		rType = 0;
 		vrLen = 1193;
 		vrLoc = 32102;
@@ -2313,7 +2334,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1035";
 		rLen = 0;
-		rLoc = 36795;
+		rLoc = 36798;
 		rType = 0;
 		vrLen = 1145;
 		vrLoc = 32098;
@@ -2323,16 +2344,16 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1052";
 		rLen = 0;
-		rLoc = 37563;
+		rLoc = 37566;
 		rType = 0;
 		vrLen = 1164;
 		vrLoc = 32098;
 	};
 	6926A9BE146C609200F69705 /* zlib.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {905, 21268}}";
-			sepNavSelRange = "{38072, 4}";
-			sepNavVisRange = "{6492, 1821}";
+			sepNavIntBoundsRect = "{{0, 0}, {905, 21346}}";
+			sepNavSelRange = "{10340, 0}";
+			sepNavVisRange = "{9045, 2376}";
 		};
 	};
 	6926A9C7146C658300F69705 /* PBXTextBookmark */ = {
@@ -2370,7 +2391,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1052";
 		rLen = 0;
-		rLoc = 37563;
+		rLoc = 37566;
 		rType = 0;
 		vrLen = 1164;
 		vrLoc = 32098;
@@ -2380,7 +2401,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1031";
 		rLen = 0;
-		rLoc = 34950;
+		rLoc = 34953;
 		rType = 0;
 		vrLen = 1078;
 		vrLoc = 32098;
@@ -2390,7 +2411,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 36547;
+		rLoc = 36550;
 		rType = 0;
 		vrLen = 1055;
 		vrLoc = 32098;
@@ -2409,7 +2430,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1287";
 		rLen = 0;
-		rLoc = 47233;
+		rLoc = 47236;
 		rType = 0;
 		vrLen = 193;
 		vrLoc = 37053;
@@ -2419,7 +2440,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1139";
 		rLen = 0;
-		rLoc = 40077;
+		rLoc = 40080;
 		rType = 0;
 		vrLen = 1815;
 		vrLoc = 34704;
@@ -2429,7 +2450,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1147";
 		rLen = 899;
-		rLoc = 40432;
+		rLoc = 40435;
 		rType = 0;
 		vrLen = 1908;
 		vrLoc = 34706;
@@ -2439,7 +2460,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1153";
 		rLen = 0;
-		rLoc = 40754;
+		rLoc = 40757;
 		rType = 0;
 		vrLen = 2044;
 		vrLoc = 35207;
@@ -2449,7 +2470,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1178";
 		rLen = 0;
-		rLoc = 41756;
+		rLoc = 41759;
 		rType = 0;
 		vrLen = 2065;
 		vrLoc = 35634;
@@ -2459,7 +2480,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 35649;
+		rLoc = 35652;
 		rType = 0;
 		vrLen = 1109;
 		vrLoc = 32174;
@@ -2469,7 +2490,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1037";
 		rLen = 0;
-		rLoc = 35491;
+		rLoc = 35494;
 		rType = 0;
 		vrLen = 1119;
 		vrLoc = 32174;
@@ -2489,7 +2510,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 10;
-		rLoc = 35688;
+		rLoc = 35691;
 		rType = 0;
 		vrLen = 1150;
 		vrLoc = 32174;
@@ -2499,7 +2520,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1043";
 		rLen = 0;
-		rLoc = 35671;
+		rLoc = 35674;
 		rType = 0;
 		vrLen = 1147;
 		vrLoc = 32174;
@@ -2509,7 +2530,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1052";
 		rLen = 0;
-		rLoc = 36455;
+		rLoc = 36458;
 		rType = 0;
 		vrLen = 1124;
 		vrLoc = 32174;
@@ -2519,7 +2540,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1050";
 		rLen = 0;
-		rLoc = 35671;
+		rLoc = 35674;
 		rType = 0;
 		vrLen = 1104;
 		vrLoc = 32174;
@@ -2529,7 +2550,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1053";
 		rLen = 0;
-		rLoc = 35886;
+		rLoc = 35889;
 		rType = 0;
 		vrLen = 1137;
 		vrLoc = 32174;
@@ -2539,7 +2560,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1055";
 		rLen = 0;
-		rLoc = 36394;
+		rLoc = 36397;
 		rType = 0;
 		vrLen = 1142;
 		vrLoc = 32174;
@@ -2549,7 +2570,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1036";
 		rLen = 0;
-		rLoc = 35227;
+		rLoc = 35230;
 		rType = 0;
 		vrLen = 1150;
 		vrLoc = 32174;
@@ -2559,7 +2580,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1061";
 		rLen = 0;
-		rLoc = 36109;
+		rLoc = 36112;
 		rType = 0;
 		vrLen = 1122;
 		vrLoc = 32174;
@@ -2569,7 +2590,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1090";
 		rLen = 0;
-		rLoc = 37238;
+		rLoc = 37241;
 		rType = 0;
 		vrLen = 1297;
 		vrLoc = 32706;
@@ -2579,7 +2600,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 441";
 		rLen = 0;
-		rLoc = 16414;
+		rLoc = 16417;
 		rType = 0;
 		vrLen = 1908;
 		vrLoc = 12417;
@@ -2589,7 +2610,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 442";
 		rLen = 0;
-		rLoc = 16320;
+		rLoc = 16323;
 		rType = 0;
 		vrLen = 1779;
 		vrLoc = 12746;
@@ -2599,7 +2620,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1099";
 		rLen = 0;
-		rLoc = 37528;
+		rLoc = 37531;
 		rType = 0;
 		vrLen = 1295;
 		vrLoc = 33118;
@@ -2609,7 +2630,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 445";
 		rLen = 0;
-		rLoc = 16414;
+		rLoc = 16417;
 		rType = 0;
 		vrLen = 1757;
 		vrLoc = 12940;
@@ -2639,7 +2660,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1059";
 		rLen = 0;
-		rLoc = 35895;
+		rLoc = 35898;
 		rType = 0;
 		vrLen = 1177;
 		vrLoc = 32255;
@@ -2649,7 +2670,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1072";
 		rLen = 0;
-		rLoc = 36444;
+		rLoc = 36447;
 		rType = 0;
 		vrLen = 1182;
 		vrLoc = 32235;
@@ -2659,7 +2680,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1072";
 		rLen = 0;
-		rLoc = 36436;
+		rLoc = 36439;
 		rType = 0;
 		vrLen = 1192;
 		vrLoc = 32235;
@@ -2679,7 +2700,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1072";
 		rLen = 0;
-		rLoc = 36436;
+		rLoc = 36439;
 		rType = 0;
 		vrLen = 1192;
 		vrLoc = 32235;
@@ -2689,7 +2710,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 36341;
+		rLoc = 36344;
 		rType = 0;
 		vrLen = 1206;
 		vrLoc = 32235;
@@ -2699,7 +2720,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 36303;
+		rLoc = 36306;
 		rType = 0;
 		vrLen = 1234;
 		vrLoc = 32235;
@@ -2719,7 +2740,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1069";
 		rLen = 0;
-		rLoc = 36303;
+		rLoc = 36306;
 		rType = 0;
 		vrLen = 1234;
 		vrLoc = 32235;
@@ -2729,7 +2750,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1045";
 		rLen = 0;
-		rLoc = 35376;
+		rLoc = 35379;
 		rType = 0;
 		vrLen = 1271;
 		vrLoc = 32235;
@@ -2739,7 +2760,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1058";
 		rLen = 0;
-		rLoc = 35643;
+		rLoc = 35646;
 		rType = 0;
 		vrLen = 1327;
 		vrLoc = 32262;
@@ -2779,7 +2800,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1058";
 		rLen = 0;
-		rLoc = 35643;
+		rLoc = 35646;
 		rType = 0;
 		vrLen = 1327;
 		vrLoc = 32262;
@@ -2789,7 +2810,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 212";
 		rLen = 0;
-		rLoc = 4754;
+		rLoc = 4757;
 		rType = 0;
 		vrLen = 1596;
 		vrLoc = 4866;
@@ -2799,7 +2820,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 298";
 		rLen = 0;
-		rLoc = 7392;
+		rLoc = 7395;
 		rType = 0;
 		vrLen = 1521;
 		vrLoc = 9063;
@@ -2819,7 +2840,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1173";
 		rLen = 0;
-		rLoc = 37779;
+		rLoc = 37782;
 		rType = 0;
 		vrLen = 1361;
 		vrLoc = 35270;
@@ -2829,7 +2850,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 217";
 		rLen = 0;
-		rLoc = 4858;
+		rLoc = 4861;
 		rType = 0;
 		vrLen = 1216;
 		vrLoc = 7015;
@@ -2839,7 +2860,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 189";
 		rLen = 0;
-		rLoc = 4754;
+		rLoc = 4757;
 		rType = 0;
 		vrLen = 1764;
 		vrLoc = 5299;
@@ -2849,7 +2870,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 189";
 		rLen = 0;
-		rLoc = 4754;
+		rLoc = 4757;
 		rType = 0;
 		vrLen = 1764;
 		vrLoc = 5299;
@@ -2859,7 +2880,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 184";
 		rLen = 0;
-		rLoc = 4754;
+		rLoc = 4757;
 		rType = 0;
 		vrLen = 1764;
 		vrLoc = 5299;
@@ -2869,7 +2890,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 189";
 		rLen = 0;
-		rLoc = 4754;
+		rLoc = 4757;
 		rType = 0;
 		vrLen = 1756;
 		vrLoc = 5299;
@@ -2879,7 +2900,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 190";
 		rLen = 0;
-		rLoc = 4754;
+		rLoc = 4757;
 		rType = 0;
 		vrLen = 1786;
 		vrLoc = 5299;
@@ -2889,7 +2910,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1134";
 		rLen = 0;
-		rLoc = 36303;
+		rLoc = 36306;
 		rType = 0;
 		vrLen = 1423;
 		vrLoc = 34344;
@@ -2899,7 +2920,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1104";
 		rLen = 0;
-		rLoc = 35372;
+		rLoc = 35375;
 		rType = 0;
 		vrLen = 1485;
 		vrLoc = 35523;
@@ -2909,7 +2930,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1104";
 		rLen = 0;
-		rLoc = 35372;
+		rLoc = 35375;
 		rType = 0;
 		vrLen = 1485;
 		vrLoc = 35523;
@@ -2919,7 +2940,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1104";
 		rLen = 0;
-		rLoc = 35372;
+		rLoc = 35375;
 		rType = 0;
 		vrLen = 1381;
 		vrLoc = 34415;
@@ -2929,7 +2950,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1121";
 		rLen = 0;
-		rLoc = 35744;
+		rLoc = 35747;
 		rType = 0;
 		vrLen = 1375;
 		vrLoc = 34119;
@@ -2939,7 +2960,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1144";
 		rLen = 0;
-		rLoc = 36532;
+		rLoc = 36535;
 		rType = 0;
 		vrLen = 1413;
 		vrLoc = 34544;
@@ -2949,7 +2970,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1127";
 		rLen = 0;
-		rLoc = 36007;
+		rLoc = 36010;
 		rType = 0;
 		vrLen = 1413;
 		vrLoc = 34544;
@@ -2959,7 +2980,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1124";
 		rLen = 0;
-		rLoc = 35861;
+		rLoc = 35864;
 		rType = 0;
 		vrLen = 1411;
 		vrLoc = 34544;
@@ -2969,7 +2990,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1277";
 		rLen = 0;
-		rLoc = 41301;
+		rLoc = 41304;
 		rType = 0;
 		vrLen = 1880;
 		vrLoc = 39504;
@@ -2979,7 +3000,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1277";
 		rLen = 0;
-		rLoc = 41328;
+		rLoc = 41331;
 		rType = 0;
 		vrLen = 1884;
 		vrLoc = 39504;
@@ -2989,7 +3010,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1278";
 		rLen = 0;
-		rLoc = 41360;
+		rLoc = 41363;
 		rType = 0;
 		vrLen = 1881;
 		vrLoc = 39504;
@@ -2999,7 +3020,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1281";
 		rLen = 0;
-		rLoc = 41360;
+		rLoc = 41363;
 		rType = 0;
 		vrLen = 2087;
 		vrLoc = 38355;
@@ -3009,7 +3030,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1281";
 		rLen = 0;
-		rLoc = 41360;
+		rLoc = 41363;
 		rType = 0;
 		vrLen = 2087;
 		vrLoc = 38355;
@@ -3019,7 +3040,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1277";
 		rLen = 0;
-		rLoc = 41328;
+		rLoc = 41331;
 		rType = 0;
 		vrLen = 2091;
 		vrLoc = 38355;
@@ -3029,7 +3050,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 183";
 		rLen = 0;
-		rLoc = 4754;
+		rLoc = 4757;
 		rType = 0;
 		vrLen = 1879;
 		vrLoc = 5538;
@@ -3039,7 +3060,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 183";
 		rLen = 0;
-		rLoc = 4754;
+		rLoc = 4757;
 		rType = 0;
 		vrLen = 1879;
 		vrLoc = 5538;
@@ -3049,7 +3070,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1184";
 		rLen = 0;
-		rLoc = 37998;
+		rLoc = 38001;
 		rType = 0;
 		vrLen = 1433;
 		vrLoc = 35814;
@@ -3059,7 +3080,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 204";
 		rLen = 0;
-		rLoc = 4754;
+		rLoc = 4757;
 		rType = 0;
 		vrLen = 1737;
 		vrLoc = 6105;
@@ -3069,7 +3090,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1198";
 		rLen = 0;
-		rLoc = 37915;
+		rLoc = 37918;
 		rType = 0;
 		vrLen = 1219;
 		vrLoc = 36144;
@@ -3109,7 +3130,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1344";
 		rLen = 0;
-		rLoc = 43088;
+		rLoc = 43091;
 		rType = 0;
 		vrLen = 1542;
 		vrLoc = 41396;
@@ -3119,7 +3140,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1344";
 		rLen = 0;
-		rLoc = 43088;
+		rLoc = 43091;
 		rType = 0;
 		vrLen = 1542;
 		vrLoc = 41396;
@@ -3129,7 +3150,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1346";
 		rLen = 0;
-		rLoc = 43075;
+		rLoc = 43078;
 		rType = 0;
 		vrLen = 1602;
 		vrLoc = 41258;
@@ -3139,7 +3160,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1349";
 		rLen = 0;
-		rLoc = 43201;
+		rLoc = 43204;
 		rType = 0;
 		vrLen = 1653;
 		vrLoc = 41258;
@@ -3149,7 +3170,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1352";
 		rLen = 0;
-		rLoc = 43485;
+		rLoc = 43488;
 		rType = 0;
 		vrLen = 1725;
 		vrLoc = 41258;
@@ -3159,7 +3180,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1354";
 		rLen = 0;
-		rLoc = 43485;
+		rLoc = 43488;
 		rType = 0;
 		vrLen = 1698;
 		vrLoc = 41258;
@@ -3169,7 +3190,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1354";
 		rLen = 0;
-		rLoc = 43429;
+		rLoc = 43432;
 		rType = 0;
 		vrLen = 1699;
 		vrLoc = 41258;
@@ -3179,7 +3200,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1356";
 		rLen = 0;
-		rLoc = 43487;
+		rLoc = 43490;
 		rType = 0;
 		vrLen = 1472;
 		vrLoc = 42122;
@@ -3189,7 +3210,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1346";
 		rLen = 0;
-		rLoc = 43031;
+		rLoc = 43034;
 		rType = 0;
 		vrLen = 1629;
 		vrLoc = 41950;
@@ -3199,7 +3220,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1346";
 		rLen = 0;
-		rLoc = 43031;
+		rLoc = 43034;
 		rType = 0;
 		vrLen = 1629;
 		vrLoc = 41950;
@@ -3209,7 +3230,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1371";
 		rLen = 0;
-		rLoc = 43766;
+		rLoc = 43769;
 		rType = 0;
 		vrLen = 1666;
 		vrLoc = 41950;
@@ -3219,7 +3240,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1339";
 		rLen = 0;
-		rLoc = 42606;
+		rLoc = 42609;
 		rType = 0;
 		vrLen = 1625;
 		vrLoc = 41950;
@@ -3229,7 +3250,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1379";
 		rLen = 0;
-		rLoc = 44000;
+		rLoc = 44003;
 		rType = 0;
 		vrLen = 1393;
 		vrLoc = 42689;
@@ -3249,7 +3270,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 347";
 		rLen = 0;
-		rLoc = 9705;
+		rLoc = 9708;
 		rType = 0;
 		vrLen = 1144;
 		vrLoc = 10747;
@@ -3259,7 +3280,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 335";
 		rLen = 0;
-		rLoc = 9249;
+		rLoc = 9252;
 		rType = 0;
 		vrLen = 1083;
 		vrLoc = 11237;
@@ -3286,7 +3307,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 335";
 		rLen = 0;
-		rLoc = 9249;
+		rLoc = 9252;
 		rType = 0;
 		vrLen = 1083;
 		vrLoc = 11237;
@@ -3466,7 +3487,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 303";
 		rLen = 0;
-		rLoc = 7999;
+		rLoc = 8002;
 		rType = 0;
 		vrLen = 959;
 		vrLoc = 8934;
@@ -3476,7 +3497,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 284";
 		rLen = 0;
-		rLoc = 7999;
+		rLoc = 8002;
 		rType = 0;
 		vrLen = 1270;
 		vrLoc = 8934;
@@ -3519,7 +3540,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 24";
 		rLen = 27;
-		rLoc = 710;
+		rLoc = 713;
 		rType = 0;
 		vrLen = 1149;
 		vrLoc = 428;
@@ -3529,7 +3550,7 @@
 		fRef = 69269F2214620D0F00F69705 /* packet_test.h */;
 		name = "packet_test.h: 26";
 		rLen = 0;
-		rLoc = 763;
+		rLoc = 766;
 		rType = 0;
 		vrLen = 867;
 		vrLoc = 0;
@@ -3619,7 +3640,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 34";
 		rLen = 0;
-		rLoc = 876;
+		rLoc = 879;
 		rType = 0;
 		vrLen = 1174;
 		vrLoc = 647;
@@ -3629,7 +3650,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 34";
 		rLen = 0;
-		rLoc = 876;
+		rLoc = 879;
 		rType = 0;
 		vrLen = 1256;
 		vrLoc = 690;
@@ -3639,7 +3660,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 34";
 		rLen = 0;
-		rLoc = 876;
+		rLoc = 879;
 		rType = 0;
 		vrLen = 1256;
 		vrLoc = 690;
@@ -3745,7 +3766,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 25";
 		rLen = 0;
-		rLoc = 777;
+		rLoc = 780;
 		rType = 0;
 		vrLen = 1193;
 		vrLoc = 575;
@@ -3755,7 +3776,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 26";
 		rLen = 0;
-		rLoc = 777;
+		rLoc = 780;
 		rType = 0;
 		vrLen = 1171;
 		vrLoc = 575;
@@ -3822,7 +3843,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 1614";
 		rLen = 0;
-		rLoc = 50824;
+		rLoc = 50827;
 		rType = 0;
 		vrLen = 1263;
 		vrLoc = 49545;
@@ -3832,7 +3853,7 @@
 		fRef = 69269F2314620D0F00F69705 /* packet.c */;
 		name = "packet.c: 27";
 		rLen = 0;
-		rLoc = 794;
+		rLoc = 797;
 		rType = 0;
 		vrLen = 1178;
 		vrLoc = 685;
@@ -3917,6 +3938,20 @@
 		vrLen = 1429;
 		vrLoc = 0;
 	};
+	6926ACFF146DC9BD00F69705 /* mpi.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {905, 618}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 1429}";
+		};
+	};
+	6926AD00146DC9BD00F69705 /* packet_private.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {905, 2769}}";
+			sepNavSelRange = "{361, 0}";
+			sepNavVisRange = "{0, 1231}";
+		};
+	};
 	6926AD03146DC9BD00F69705 /* util.c */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {905, 702}}";
@@ -3948,6 +3983,136 @@
 		vrLen = 1420;
 		vrLoc = 0;
 	};
+	6926AD1E146DCB4800F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD00146DC9BD00F69705 /* packet_private.h */;
+		name = "packet_private.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1228;
+		vrLoc = 0;
+	};
+	6926AD1F146DCB4800F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AC66146DBC7D00F69705 /* README */;
+		name = "README: 27";
+		rLen = 0;
+		rLoc = 937;
+		rType = 0;
+		vrLen = 1119;
+		vrLoc = 0;
+	};
+	6926AD20146DCB4800F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926ACFF146DC9BD00F69705 /* mpi.h */;
+		name = "mpi.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1429;
+		vrLoc = 0;
+	};
+	6926AD21146DCB4800F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 69269F2414620D0F00F69705 /* packet.h */;
+		name = "packet.h: 7";
+		rLen = 603;
+		rLoc = 81;
+		rType = 0;
+		vrLen = 1510;
+		vrLoc = 0;
+	};
+	6926AD22146DCB4800F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD03146DC9BD00F69705 /* util.c */;
+		name = "util.c: 18";
+		rLen = 0;
+		rLoc = 642;
+		rType = 0;
+		vrLen = 1420;
+		vrLoc = 0;
+	};
+	6926AD23146DCB4800F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD03146DC9BD00F69705 /* util.c */;
+		name = "util.c: 18";
+		rLen = 0;
+		rLoc = 642;
+		rType = 0;
+		vrLen = 1420;
+		vrLoc = 0;
+	};
+	6926AD2A146DCE7600F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD03146DC9BD00F69705 /* util.c */;
+		name = "util.c: 18";
+		rLen = 0;
+		rLoc = 642;
+		rType = 0;
+		vrLen = 1420;
+		vrLoc = 0;
+	};
+	6926AD2F146DDA4700F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 69269F2314620D0F00F69705 /* packet.c */;
+		name = "packet.c: 1496";
+		rLen = 0;
+		rLoc = 47236;
+		rType = 0;
+		vrLen = 261;
+		vrLoc = 37622;
+	};
+	6926AD42146DDA7900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD03146DC9BD00F69705 /* util.c */;
+		name = "util.c: 18";
+		rLen = 0;
+		rLoc = 642;
+		rType = 0;
+		vrLen = 1420;
+		vrLoc = 0;
+	};
+	6926AD43146DDA7900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 69868BC91460F386004C5D9B /* gcrypt.h */;
+		name = "gcrypt.h: 1117";
+		rLen = 12;
+		rLoc = 43712;
+		rType = 0;
+		vrLen = 1677;
+		vrLoc = 42778;
+	};
+	6926AD44146DDA7900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926A9BE146C609200F69705 /* zlib.h */;
+		name = "zlib.h: 243";
+		rLen = 0;
+		rLoc = 10340;
+		rType = 0;
+		vrLen = 2376;
+		vrLoc = 9045;
+	};
+	6926AD45146DDA7900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 69868BC61460F37E004C5D9B /* gpg-error.h */;
+		name = "gpg-error.h: 551";
+		rLen = 12;
+		rLoc = 19751;
+		rType = 0;
+		vrLen = 1326;
+		vrLoc = 18819;
+	};
+	6926AD46146DDA7900F69705 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = 6926AD00146DC9BD00F69705 /* packet_private.h */;
+		name = "packet_private.h: 14";
+		rLen = 0;
+		rLoc = 361;
+		rType = 0;
+		vrLen = 1231;
+		vrLoc = 0;
+	};
 	69868AD41460E35F004C5D9B /* Source Control */ = {
 		isa = PBXSourceControlManager;
 		fallbackIsa = XCSourceControlManager;
@@ -3964,9 +4129,9 @@
 	};
 	69868BC61460F37E004C5D9B /* gpg-error.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {565, 8723}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 880}";
+			sepNavIntBoundsRect = "{{0, 0}, {905, 8684}}";
+			sepNavSelRange = "{19751, 12}";
+			sepNavVisRange = "{18819, 1326}";
 		};
 	};
 	69868BC81460F386004C5D9B /* gcrypt-module.h */ = {
@@ -3978,9 +4143,9 @@
 	};
 	69868BC91460F386004C5D9B /* gcrypt.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {905, 23725}}";
-			sepNavSelRange = "{42466, 0}";
-			sepNavVisRange = "{41093, 1607}";
+			sepNavIntBoundsRect = "{{0, 0}, {905, 24739}}";
+			sepNavSelRange = "{43712, 12}";
+			sepNavVisRange = "{42778, 1677}";
 		};
 	};
 	69868BD11460F42D004C5D9B /* PBXTextBookmark */ = {

diff --git a/src/Makefile.am b/src/Makefile.am
line changes: +15/-0
index 0000000..dacbb3d
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,15 @@
+AUTOMAKE_OPTIONS = foreign
+
+CFLAGS=-Wall -O2 `libgcrypt-config --cflags` `gpg-error-config --cflags` -I/usr/include -I/usr/local/include
+LDFLAGS=`libgcrypt-config --libs` `gpg-error-config --libs`
+
+pkglib_LTLIBRARIES = libsimplepgp.la
+pkginclude_HEADERS = packet.h
+
+libsimplepgp_la_SOURCES = \
+	packet.c \
+	keychain.c \
+	util.c \
+	mpi.c 
+
+

diff --git a/src/keychain.h b/src/keychain.h
line changes: +1/-1
index 1712985..4aa8285
--- a/src/keychain.h
+++ b/src/keychain.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include <pthread.h>
-#include "packet.h"
+#include "simplepgp.h"
 
 
 uint8_t spgp_keychain_init(void);

diff --git a/src/packet.c b/src/packet.c
line changes: +1/-1
index 025f879..b44e1de
--- a/src/packet.c
+++ b/src/packet.c
@@ -20,7 +20,7 @@
  *
  */
 
-#include "packet.h"
+#include "simplepgp.h"
 #include "packet_private.h"
 #include "keychain.h"
 #include "util.h"

diff --git a/src/packet.h b/src/packet.h
line changes: +0/-93
index c24a8da..0000000
--- a/src/packet.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  packet.h
- *  libsimplepgp
- *
- *  Created by Trevor Bentley on 11/1/11.
- *
- *  Copyright 2011 Trevor Bentley
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
- 
-#ifndef _PACKET_H
-
-#include <stdio.h>
-#include <stdint.h>
-
-typedef struct spgp_packet_header_struct spgp_pkt_header_t;
-typedef struct spgp_packet_struct spgp_packet_t;
-typedef struct spgp_mpi_struct spgp_mpi_t;
-typedef struct spgp_public_packet_struct  spgp_public_pkt_t;
-typedef struct spgp_secret_packet_struct  spgp_secret_pkt_t;
-typedef struct spgp_userid_packet_struct  spgp_userid_pkt_t;
-typedef struct spgp_session_packet_struct spgp_session_pkt_t;
-typedef struct spgp_literal_packet_struct spgp_literal_pkt_t;
-
-
-/**
- * Break a binary OpenPGP message into decoded packets.
- *
- * @param message Binary OpenPGP message to analyze
- * @param length Length of |message|
- * @return Linked list of decoded PGP packets, or NULL on failure
- */
-spgp_packet_t *spgp_decode_message(uint8_t *message, uint32_t length);
-
-
-/**
- * Decrypt all secret keys found in |msg| with given passphrase.
- *
- * @param msg Linked list of PGP packets
- * @param passphrase String to use as decryption passphrase.  No NUL termination.
- * @param length Length of passphrase.
- * @return 0 for success, non-0 for failure.
- */
-uint8_t spgp_decrypt_all_secret_keys(spgp_packet_t *msg, 
-                                		 uint8_t *passphrase, uint32_t length);
-
-/**
- * Frees all dynamic resources associated with |pkt|.
- */
-void spgp_free_packet(spgp_packet_t **pkt);
-
-/**
- * Get last error code
- *
- * @return Value of last error
- */
-uint32_t spgp_err(void);
-
-/**
- * Return a string describing error code |err|.
- *
- * @return String describing error code |err|
- */
-const char *spgp_err_str(uint32_t err);
-
-/**
- * Return true if debugging enabled, false otherwise.
- *
- * @return 0 if logging disabled, non-zero if logging enabled.
- */
-uint8_t spgp_debug_log_enabled(void);
-
-/**
- * Enables debug logging to stderr
- *
- * @param enable 0 if logging should be off, 1 if logging should be on.
- */
-void spgp_debug_log_set(uint8_t enable);
-
-#define _PACKET_H
-#endif

diff --git a/src/packet_private.h b/src/packet_private.h
line changes: +1/-1
index be9916f..950894a
--- a/src/packet_private.h
+++ b/src/packet_private.h
@@ -22,7 +22,7 @@
 
 #ifndef _PACKET_PRIVATE_H
 
-#include "packet.h"
+#include "simplepgp.h"
 #include "gcrypt.h"
 
 #include <stdio.h>

diff --git a/src/packet_test.h b/src/packet_test.h
line changes: +1/-1
index ba94ac8..d4d4320
--- a/src/packet_test.h
+++ b/src/packet_test.h
@@ -22,7 +22,7 @@
 
 #ifndef _PACKET_TEST_H
 
-#include "packet.h"
+#include "simplepgp.h"
 #include "packet_private.h"
 #include <stdint.h>
 #include <stdio.h>

diff --git a/src/simplepgp.h b/src/simplepgp.h
line changes: +93/-0
index 0000000..5d7555e
--- /dev/null
+++ b/src/simplepgp.h
@@ -0,0 +1,93 @@
+/*
+ *  simplepgp.h
+ *  libsimplepgp
+ *
+ *  Created by Trevor Bentley on 11/1/11.
+ *
+ *  Copyright 2011 Trevor Bentley
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+ 
+#ifndef _PACKET_H
+
+#include <stdio.h>
+#include <stdint.h>
+
+typedef struct spgp_packet_header_struct spgp_pkt_header_t;
+typedef struct spgp_packet_struct spgp_packet_t;
+typedef struct spgp_mpi_struct spgp_mpi_t;
+typedef struct spgp_public_packet_struct  spgp_public_pkt_t;
+typedef struct spgp_secret_packet_struct  spgp_secret_pkt_t;
+typedef struct spgp_userid_packet_struct  spgp_userid_pkt_t;
+typedef struct spgp_session_packet_struct spgp_session_pkt_t;
+typedef struct spgp_literal_packet_struct spgp_literal_pkt_t;
+
+
+/**
+ * Break a binary OpenPGP message into decoded packets.
+ *
+ * @param message Binary OpenPGP message to analyze
+ * @param length Length of |message|
+ * @return Linked list of decoded PGP packets, or NULL on failure
+ */
+spgp_packet_t *spgp_decode_message(uint8_t *message, uint32_t length);
+
+
+/**
+ * Decrypt all secret keys found in |msg| with given passphrase.
+ *
+ * @param msg Linked list of PGP packets
+ * @param passphrase String to use as decryption passphrase.  No NUL termination.
+ * @param length Length of passphrase.
+ * @return 0 for success, non-0 for failure.
+ */
+uint8_t spgp_decrypt_all_secret_keys(spgp_packet_t *msg, 
+                                		 uint8_t *passphrase, uint32_t length);
+
+/**
+ * Frees all dynamic resources associated with |pkt|.
+ */
+void spgp_free_packet(spgp_packet_t **pkt);
+
+/**
+ * Get last error code
+ *
+ * @return Value of last error
+ */
+uint32_t spgp_err(void);
+
+/**
+ * Return a string describing error code |err|.
+ *
+ * @return String describing error code |err|
+ */
+const char *spgp_err_str(uint32_t err);
+
+/**
+ * Return true if debugging enabled, false otherwise.
+ *
+ * @return 0 if logging disabled, non-zero if logging enabled.
+ */
+uint8_t spgp_debug_log_enabled(void);
+
+/**
+ * Enables debug logging to stderr
+ *
+ * @param enable 0 if logging should be off, 1 if logging should be on.
+ */
+void spgp_debug_log_set(uint8_t enable);
+
+#define _PACKET_H
+#endif