convert documentation to texinfo

author: Francis Rowe <info@gluglug.org.uk> 2015-11-06 17:43:29 (EST)
committer: Francis Rowe <info@gluglug.org.uk> 2015-11-06 23:45:09 (EST)
commit: 95259e28ef047923258434898113d70c8e544eab (patch)
tree: 1c0501bf4c7df1c31948184dabfc1e7c4c215a6e /docs/security
parent: 707f9383a8189b0054730134340f20709f56f976 (diff)
download: libreboot-95259e28ef047923258434898113d70c8e544eab.zip
libreboot-95259e28ef047923258434898113d70c8e544eab.tar.gz
libreboot-95259e28ef047923258434898113d70c8e544eab.tar.bz2
8 files changed, 707 insertions, 1094 deletions
diff --git a/docs/security/dock.html b/docs/security/dock.html
deleted file mode 100644
index 7657739..0000000
--- a/docs/security/dock.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-
-	<style type="text/css">
-		@import url('../css/main.css');
-	</style>
-
-	<title>Notes about DMA and the docking station (X60/T60)</title>
-</head>
-
-<body>
-	<div class="section">
-		<h1>Notes about DMA and the docking station (X60/T60)</h1>
-	</div>
-
-	<div class="section">
-<pre>
-
-Use case:
----------
-Usually when people do full disk encryption, it's not really full disk,
-instead they still have a /boot in clear.
-
-So an evil maid attack can still be done, in two passes:
-1) Clone the hdd, Infect the initramfs or the kernel.
-2) Wait for the user to enter its password, recover the password,
-luksOpen the hdd image.
-
-I wanted a real full-disk encryption so I've put grub in flash and I
-have the following: The HDD has a LUKS rootfs(containing /boot) on an
-lvm partition, so no partition is in clear.
-
-So when the computer boots it executes coreboot, then grub as a payload.
-Grub then opens the LUKS partition and loads the kernel and initramfs
-from there.
-
-To prevent hardware level tempering(like reflashing), I used nail
-polish with a lot of gilder, that acts like a seal. Then a high
-resolution picture of it is taken, to be able to tell the difference.
-
-The problem:
-------------
-But then comes the docking port issue: Some LPC pins are exported
-there, such as the CLKRUN and LDRQ#.
-
-LDRQ# is "Encoded DMA/Bus Master Request": "Only needed by
-peripherals that need DMA or bus mastering. Requires an
-individual signal per peripheral. Peripherals may not share
-an LDRQ# signal."
-
-So now DMA access is possible trough the dock connector.
-So I want to be able to turn that off.
-
-If I got it right, the X60 has 2 superio, one is in the dock, and the
-other one is in the laptop, so we have:
-                            ________________
- _________________         |                |
-|                 |        | Dock connector:|
-|Dock: NSC pc87982|&lt;--LPC---&gt;D_LPC_DREQ0    |
-|_________________|        |_______^________|
-                                   |
-                                   |
-                                   |
-                                   |
-                ___________________|____
-               |                   v    |
-               | SuperIO:        DLDRQ# |
-               | NSC pc87382     LDRQ#  |
-               |___________________^____|
-                                   |
-                                   |
-                                   |
-                                   |
-                ___________________|___
-               |                   v   |
-               | Southbridge:    LDRQ0 |
-               | ICH7                  |
-               |_______________________|
-
-
-The code:
----------
-Now if I look at the existing code, there is some superio drivers, like
-pc87382 in src/superio/nsc, the code is very small. 
-The only interesting part is the pnp_info pnp_dev_info struct.
-
-Now if I look inside src/mainboard/lenovo/x60 there is some more
-complete dock driver:
-
-Inside dock.c I see some dock_connect and dock_disconnect functions.
-
-Such functions are called during the initialisation (romstage.c) and
-from the X60 SMI handler (smihandler.c).
-
-Questions:
-----------
-1) Would the following be sufficent to prevent DMA access from the
-outside:
-&gt; int dock_connect(void)
-&gt; {
-&gt;          int timeout = 1000;
-&gt; +        int val;
-&gt; +        
-&gt; +        if (get_option(&amp;val, &quot;dock&quot;) != CB_SUCCESS)
-&gt; +                val = 1;
-&gt; +        if (val == 0)
-&gt; +                return 0;
-&gt;          [...]
-&gt; }
->
-&gt; void dock_disconnect(void) {
-&gt; +        if (dock_present())
-&gt; +                return;
-&gt;          [...]
-&gt; }
-2) Would an nvram option be ok for that? Should a Kconfig option be
-added too?
-
-&gt; config DOCK_AUTODETECT
-&gt;         bool "Autodetect"
-&gt;         help
-&gt;           The dock is autodetected. If unsure select this option.
->
-&gt; config DOCK_DISABLED
-&gt;         bool "Disabled"
-&gt;         help
-&gt;           The dock is always disabled.
->
-&gt; config DOCK_NVRAM_ENABLE
-&gt;         bool "Nvram"
-&gt;         help
-&gt;           The dock autodetection is tried only if it is also enabled
-&gt; trough nvram.
-
-</pre>
-	</div>
-
-	<div class="section">
-
-		<p>
-			Copyright &copy;  2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
-			Permission is granted to copy, distribute and/or modify this document
-			under the terms of the GNU Free Documentation License, Version 1.3
-			or any later version published by the Free Software Foundation;
-			with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-			A copy of the license can be found at <a href="../gfdl-1.3.txt">../gfdl-1.3.txt</a>
-		</p>
-
-		<p>
-			Updated versions of the license (when available) can be found at
-			<a href="https://www.gnu.org/licenses/licenses.html">https://www.gnu.org/licenses/licenses.html</a>
-		</p>
-
-		<p>
-			UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-			EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-			AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-			ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-			IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-			WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-			PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-			ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-			KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-			ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-		</p>
-		<p>
-			TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-			TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-			NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-			INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-			COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-			USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-			ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-			DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-			IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-		</p>
-		<p>
-			The disclaimer of warranties and limitation of liability provided
-			above shall be interpreted in a manner that, to the extent
-			possible, most closely approximates an absolute disclaimer and
-			waiver of all liability.
-		</p>
-		
-	</div>
-
-</body>
-</html>
diff --git a/docs/security/dock.texi b/docs/security/dock.texi
new file mode 100644
index 0000000..8595c58
--- /dev/null
+++ b/docs/security/dock.texi
@@ -0,0 +1,151 @@
+\input texinfo
+@documentencoding UTF-8
+
+@ifnottex
+@paragraphindent 0
+@end ifnottex
+@titlepage
+@title Notes about DMA and the docking station (X60/T60)
+@end titlepage
+
+@node Top
+@top Notes about DMA and the docking station (X60/T60)
+
+@menu
+* Notes about DMA and the docking station X60/T60::
+@end menu
+
+@node Notes about DMA and the docking station X60/T60
+@chapter Notes about DMA and the docking station (X60/T60)
+@anchor{#notes-about-dma-and-the-docking-station-x60t60}
+
+@verbatim
+
+Use case:
+---------
+Usually when people do full disk encryption, it's not really full disk,
+instead they still have a /boot in clear.
+
+So an evil maid attack can still be done, in two passes:
+1) Clone the hdd, Infect the initramfs or the kernel.
+2) Wait for the user to enter its password, recover the password,
+luksOpen the hdd image.
+
+I wanted a real full-disk encryption so I've put grub in flash and I
+have the following: The HDD has a LUKS rootfs(containing /boot) on an
+lvm partition, so no partition is in clear.
+
+So when the computer boots it executes coreboot, then grub as a payload.
+Grub then opens the LUKS partition and loads the kernel and initramfs
+from there.
+
+To prevent hardware level tempering(like reflashing), I used nail
+polish with a lot of gilder, that acts like a seal. Then a high
+resolution picture of it is taken, to be able to tell the difference.
+
+The problem:
+------------
+But then comes the docking port issue: Some LPC pins are exported
+there, such as the CLKRUN and LDRQ#.
+
+LDRQ# is "Encoded DMA/Bus Master Request": "Only needed by
+peripherals that need DMA or bus mastering. Requires an
+individual signal per peripheral. Peripherals may not share
+an LDRQ# signal."
+
+So now DMA access is possible trough the dock connector.
+So I want to be able to turn that off.
+
+If I got it right, the X60 has 2 superio, one is in the dock, and the
+other one is in the laptop, so we have:
+                            ________________
+ _________________         |                |
+|                 |        | Dock connector:|
+|Dock: NSC pc87982|<--LPC--->D_LPC_DREQ0    |
+|_________________|        |_______^________|
+                                   |
+                                   |
+                                   |
+                                   |
+                ___________________|____
+               |                   v    |
+               | SuperIO:        DLDRQ# |
+               | NSC pc87382     LDRQ#  |
+               |___________________^____|
+                                   |
+                                   |
+                                   |
+                                   |
+                ___________________|___
+               |                   v   |
+               | Southbridge:    LDRQ0 |
+               | ICH7                  |
+               |_______________________|
+
+
+The code:
+---------
+Now if I look at the existing code, there is some superio drivers, like
+pc87382 in src/superio/nsc, the code is very small. 
+The only interesting part is the pnp_info pnp_dev_info struct.
+
+Now if I look inside src/mainboard/lenovo/x60 there is some more
+complete dock driver:
+
+Inside dock.c I see some dock_connect and dock_disconnect functions.
+
+Such functions are called during the initialisation (romstage.c) and
+from the X60 SMI handler (smihandler.c).
+
+Questions:
+----------
+1) Would the following be sufficent to prevent DMA access from the
+outside:
+> int dock_connect(void)
+> {
+>          int timeout = 1000;
+> +        int val;
+> +        
+> +        if (get_option(&val, "dock") != CB_SUCCESS)
+> +                val = 1;
+> +        if (val == 0)
+> +                return 0;
+>          [...]
+> }
+>
+> void dock_disconnect(void) {
+> +        if (dock_present())
+> +                return;
+>          [...]
+> }
+2) Would an nvram option be ok for that? Should a Kconfig option be
+added too?
+
+> config DOCK_AUTODETECT
+>         bool "Autodetect"
+>         help
+>           The dock is autodetected. If unsure select this option.
+>
+> config DOCK_DISABLED
+>         bool "Disabled"
+>         help
+>           The dock is always disabled.
+>
+> config DOCK_NVRAM_ENABLE
+>         bool "Nvram"
+>         help
+>           The dock autodetection is tried only if it is also enabled
+> trough nvram.
+@end verbatim
+
+Copyright © 2014, 2015 Francis Rowe <info@@gluglug.org.uk>@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found at @uref{../gfdl-1.3.txt,../gfdl-1.3.txt}
+
+Updated versions of the license (when available) can be found at @uref{https://www.gnu.org/licenses/licenses.html,https://www.gnu.org/licenses/licenses.html}
+
+UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+@bye
diff --git a/docs/security/index.html b/docs/security/index.html
deleted file mode 100644
index 333c2c9..0000000
--- a/docs/security/index.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-
-	<style type="text/css">
-		@import url('../css/main.css');
-	</style>
-
-	<title>Security topics</title>
-</head>
-
-<body>
-
-	<div class="section">
-		<h1 id="pagetop">Security topics</h1>
-			<p>
-				Or <a href="../index.html">Back to main index</a>.
-			</p>
-			<ul>
-				<li><a href="x60_security.html">ThinkPad X60/X60S: hardware security</a></li>
-				<li><a href="t60_security.html">ThinkPad T60: hardware security</a></li>
-			</ul>
-	</div>
-
-	<div class="section">
-
-		<p>
-			Copyright &copy;  2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
-			Permission is granted to copy, distribute and/or modify this document
-			under the terms of the GNU Free Documentation License, Version 1.3
-			or any later version published by the Free Software Foundation;
-			with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-			A copy of the license can be found at <a href="../gfdl-1.3.txt">../gfdl-1.3.txt</a>
-		</p>
-
-		<p>
-			Updated versions of the license (when available) can be found at
-			<a href="https://www.gnu.org/licenses/licenses.html">https://www.gnu.org/licenses/licenses.html</a>
-		</p>
-
-		<p>
-			UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-			EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-			AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-			ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-			IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-			WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-			PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-			ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-			KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-			ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-		</p>
-		<p>
-			TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-			TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-			NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-			INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-			COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-			USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-			ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-			DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-			IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-		</p>
-		<p>
-			The disclaimer of warranties and limitation of liability provided
-			above shall be interpreted in a manner that, to the extent
-			possible, most closely approximates an absolute disclaimer and
-			waiver of all liability.
-		</p>
-		
-	</div>
-
-</body>
-</html>
diff --git a/docs/security/index.texi b/docs/security/index.texi
new file mode 100644
index 0000000..32575b1
--- /dev/null
+++ b/docs/security/index.texi
@@ -0,0 +1,40 @@
+\input texinfo
+@documentencoding UTF-8
+
+@ifnottex
+@paragraphindent 0
+@end ifnottex
+@titlepage
+@title Security topics
+@end titlepage
+
+@node Top
+@top Security topics
+
+@menu
+* Security topics::
+@end menu
+
+@node Security topics
+@chapter Security topics
+@anchor{#security-topics}
+Or @uref{../index.html,Back to main index}.
+
+@itemize
+@item
+@uref{x60_security.html,ThinkPad X60/X60S: hardware security}
+@item
+@uref{t60_security.html,ThinkPad T60: hardware security}
+@end itemize
+
+Copyright © 2014, 2015 Francis Rowe <info@@gluglug.org.uk>@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found at @uref{../gfdl-1.3.txt,../gfdl-1.3.txt}
+
+Updated versions of the license (when available) can be found at @uref{https://www.gnu.org/licenses/licenses.html,https://www.gnu.org/licenses/licenses.html}
+
+UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+@bye
diff --git a/docs/security/t60_security.html b/docs/security/t60_security.html
deleted file mode 100644
index 9defc30..0000000
--- a/docs/security/t60_security.html
+++ /dev/null
@@ -1,484 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-
-	<style type="text/css">
-		@import url('../css/main.css');
-	</style>
-
-	<title>Libreboot documentation: Security on the ThinkPad T60</title>
-</head>
-
-<body>
-
-	<div class="section">
-		<h1>Security on the ThinkPad T60</h1>
-			<p>Hardware modifications to enhance security on the ThinkPad T60. This tutorial is <b>incomplete</b> at the time of writing.</p>
-			<p><a href="index.html">Back to previous index</a></p>
-	</div>
-
-	<div class="section">
-		<h1>Table of Contents</h1>
-			<ul>
-				<li><a href="#hardware_requirements">Hardware Requirements</a></li>
-				<li><a href="#software_requirements">Software Requirements</a></li>
-				<li><a href="#procedure">The procedure</a></li>
-			</ul>
-		<h1 id="hardware_requirements">Hardware requirements</h1>
-			<ul>
-				<li>A T60</li>
-				<li>screwdriver</li>
-				<li>Rubbing or isopropyl alcohol, and thermal compound.</li>
-				<li>(in a later version of this tutorial: soldering iron and scalpel)</li>
-			</ul>
-		<h1 id="software_requirements">Software requirements</h1>
-			<ul>
-				<li>none (at least in the scope of the article as-is)</li>
-				<li>You probably want to encrypt your GNU/Linux install using LUKS</li>
-			</ul>
-	</div>
-
-	<div class="section">
-		<h1>
-			Rationale
-		</h1>
-			<p>
-				Most people think of security on the software side: the hardware is important aswell.
-			</p>
-			<p>
-				This tutorial deals with reducing the number of devices that have direct memory access that
-				could communicate with inputs/outputs that could be used to remotely
-				command the system (or leak data). All of this is purely theoretical for the time being.
-			</p>
-	</div>
-
-	<div class="section">
-
-		<h1 id="procedure">Disassembly</h1>
-
-			<p>
-				Remove those screws and remove the HDD:<br/>
-				<img src="../images/t60_dev/0001.JPG" alt="" /> <img src="../images/t60_dev/0002.JPG" alt="" />
-			</p>
-
-			<p>
-				Lift off the palm rest:<br/>
-				<img src="../images/t60_dev/0003.JPG" alt="" />
-			</p>
-
-			<p>
-				Lift up the keyboard, pull it back a bit, flip it over like that and then disconnect it from the board:<br/>
-				<img src="../images/t60_dev/0004.JPG" alt="" /> <img src="../images/t60_dev/0005.JPG" alt="" /> <img src="../images/t60_dev/0006.JPG" alt="" />
-			</p>
-
-			<p>
-				Gently wedge both sides loose:<br/>
-				<img src="../images/t60_dev/0007.JPG" alt="" /> <img src="../images/t60_dev/0008.JPG" alt="" />
-			</p>
-
-			<p>
-				Remove that cable from the position:<br/>
-				<img src="../images/t60_dev/0009.JPG" alt="" /> <img src="../images/t60_dev/0010.JPG" alt="" />
-			</p>
-
-			<p>
-				Now remove that bezel. Remove wifi, nvram battery and speaker connector (also remove 56k modem, on the left of wifi):<br/>
-				<img src="../images/t60_dev/0011.JPG" alt="" /><br/>
-				Reason: has direct (and very fast) memory access, and could (theoretically) leak data over a side-channel.<br/>
-				<b>Wifi:</b> The ath5k/ath9k cards might not have firmware at all. They might safe but could have
-				access to the computer's RAM trough DMA. If people have an intel
-				card(most T60 laptops come with Intel wifi by default, until you change it),then that card runs
-				a non-free firwamre and has access to the computer's RAM trough DMA! So
-				the risk-level is very high.
-			</p>
-
-			<p>
-				Remove those screws:<br/>
-				<img src="../images/t60_dev/0012.JPG" alt="" />
-			</p>
-
-			<p>
-				Disconnect the power jack:<br/>
-				<img src="../images/t60_dev/0013.JPG" alt="" />
-			</p>
-
-			<p>
-				Remove nvram battery (we will put it back later):<br/>
-				<img src="../images/t60_dev/0014.JPG" alt="" />
-			</p>
-
-			<p>
-				Disconnect cable (for 56k modem) and disconnect the other cable:<br/>
-				<img src="../images/t60_dev/0015.JPG" alt="" /> <img src="../images/t60_dev/0016.JPG" alt="" />
-			</p>
-
-			<p>
-				Disconnect speaker cable:<br/>
-				<img src="../images/t60_dev/0017.JPG" alt="" />
-			</p>
-
-			<p>
-				Disconnect the other end of the 56k modem cable:<br/>
-				<img src="../images/t60_dev/0018.JPG" alt="" />
-			</p>
-
-			<p>
-				Make sure you removed it:<br/>
-				<img src="../images/t60_dev/0019.JPG" alt="" />
-			</p>
-
-			<p>
-				Unscrew those:<br/>
-				<img src="../images/t60_dev/0020.JPG" alt="" />
-			</p>
-
-			<p>
-				Make sure you removed those:<br/>
-				<img src="../images/t60_dev/0021.JPG" alt="" />
-			</p>
-
-			<p>
-				Disconnect LCD cable from board:<br/>
-				<img src="../images/t60_dev/0022.JPG" alt="" />
-			</p>
-
-			<p> 
-				Remove those screws then remove the LCD assembly:<br/>
-				<img src="../images/t60_dev/0023.JPG" alt="" /> <img src="../images/t60_dev/0024.JPG" alt="" /> <img src="../images/t60_dev/0025.JPG" alt="" />
-			</p>
-
-			<p>
-				Once again, make sure you removed those:<br/>
-				<img src="../images/t60_dev/0026.JPG" alt="" />
-			</p>
-
-			<p>
-				Remove the shielding containing the motherboard, then flip it over. Remove these screws, placing them on a steady
-				surface in the same layout as they were in before you removed them. Also, you should mark each screw hole after removing the
-				screw (a permanent marker pen will do), this is so that you have a point of reference when re-assembling the system:<br/>
-				<img src="../images/t60_dev/0027.JPG" alt="" /> <img src="../images/t60_dev/0028.JPG" alt="" /> <img src="../images/t60_dev/0029.JPG" alt="" />
-				<img src="../images/t60_dev/0031.JPG" alt="" /> <img src="../images/t60_dev/0032.JPG" alt="" /> <img src="../images/t60_dev/0033.JPG" alt="" />
-			</p>
-
-			<p>
-				Remove microphone (soldering iron not needed. Just wedge it out gently):<br/>
-				<img src="../images/t60_dev/0039.JPG" alt="" /><br/>
-				<b>Rationale:</b><br/>
-				Another reason to remove the microphone: If your computer gets<a href="#ref1">[1]</a> compromised, it can
-				record what you say, and use it to receive data from nearby devices if
-				they're compromised too. Also, we do not know what the built-in microcode (in the CPU) is doing; it could theoretically
-				be programmed to accept remote commands from some speaker somewhere (remote security hole). <b>In other words,
-				the system could already be compromised from the factory.</b>
-			</p>
-
-			<p>
-				Remove infrared:<br/>
-				<img src="../images/t60_dev/0040.JPG" alt="" /> <img src="../images/t60_dev/0042.JPG" alt="" />
-			</p>
-
-			<p>
-				Remove cardbus (it's in a socket, no need to disable. Just remove the port itself):<br/>
-				<img src="../images/t60_dev/0041.JPG" alt="" /><br/>
-				<b>Rationale:</b><br/>
-				It has direct memory access and can be used to extract sensitive details (such as LUKS keys). See
-				'GoodBIOS' video linked at the end (speaker is Peter Stuge, a coreboot hacker). The video covers X60
-				but the same topics apply to T60.
-			</p>
-
-			<p>
-				Before re-installing the upper chassis, remove the speaker:<br/>
-				<img src="../images/t60_dev/0043.JPG" alt="" /> <img src="../images/t60_dev/0044.JPG" alt="" /><br/>
-				Reason: combined with the microphone issue, this could be used to leak data.<br/>
-				If your computer gets<a href="#ref1">[1]</a> compromised, it can be used to
-				transmit data to nearby compromised devices. It's unknown if it can be
-				turned into a microphone<a href="#ref2">[2]</a>.<br/>
-				Replacement: headphones/speakers (line-out) or external DAC (USB).
-			</p>
-
-			<p>
-				Remove the wwan:<br/>
-				<img src="../images/t60_dev/0045.JPG" alt="" /><br/>
-				<b>Wwan (3g modem):</b> They run proprietary software! It's like AMT but over the GSM network which is
-				probably even worse.<br/>
-				Replacement: external USB wifi dongle. (or USB wwan/3g dongle; note, this has all the same privacy issues as mobile phones. wwan not recommended).
-			</p>
-
-			<p>
-				This is where the simcard connector is soldered. See notes above about wwan. Remove simcard by removing battery
-				and then it's accessible (so, remember to do this when you re-assemble. or you could do it now?)<br/>
-				<img src="../images/t60_dev/0046.JPG" alt="" />
-			</p>
-
-			<p>
-				Put those screws back:<br/>
-				<img src="../images/t60_dev/0047.JPG" alt="" />
-			</p>
-
-			<p>
-				Put it back into lower chassis:<br/>
-				<img src="../images/t60_dev/0048.JPG" alt="" />
-			</p>
-
-			<p>
-				Attach LCD and insert screws (also, attach the lcd cable to the board):<br/>
-				<img src="../images/t60_dev/0049.JPG" alt="" />
-			</p>
-
-			<p>
-				Insert those screws:<br/>
-				<img src="../images/t60_dev/0050.JPG" alt="" />
-			</p>
-
-			<p>
-				On the CPU (and there is another chip south-east to it, sorry forgot to take pic)
-				clean off the old thermal paste (with the alcohol) and apply new (Artic Silver 5 is good, others are good too)
-				you should also clean the heatsink the same way<br/>
-				<img src="../images/t60_dev/0051.JPG" alt="" />
-			</p>
-
-			<p>
-				Attach the heatsink and install the screws (also, make sure to install the AC jack as highlighted):<br/>
-				<img src="../images/t60_dev/0052.JPG" alt="" />
-			</p>
-
-			<p>
-				Reinstall that upper bezel:<br/>
-				<img src="../images/t60_dev/0053.JPG" alt="" />
-			</p>
-
-			<p>
-				Do that:<br/>
-				<img src="../images/t60_dev/0054.JPG" alt="" /> <img src="../images/t60_dev/0055.JPG" alt="" />
-			</p>
-
-			<p>
-				Attach keyboard and install nvram battery:<br/>
-				<img src="../images/t60_dev/0056.JPG" alt="" /> <img src="../images/t60_dev/0057.JPG" alt="" />
-			</p>
-
-			<p>
-				Place keyboard and (sorry, forgot to take pics) reinstall the palmrest and insert screws on the underside:<br/>
-				<img src="../images/t60_dev/0058.JPG" alt="" />
-			</p>
-
-			<p>
-				Remove those covers and unscrew:<br/>
-				<img src="../images/t60_dev/0059.JPG" alt="" /> <img src="../images/t60_dev/0060.JPG" alt="" /> <img src="../images/t60_dev/0061.JPG" alt="" />
-			</p>
-
-			<p>
-				Gently pry off the front bezel (sorry, forgot to take pics).
-			</p>
-
-			<p>
-				Remove bluetooth module:<br/>
-				<img src="../images/t60_dev/0062.JPG" alt="" /> <img src="../images/t60_dev/0063.JPG" alt="" />
-			</p>
-
-			<p>
-				Re-attach the front bezel and re-insert the screws (sorry, forgot to take pics).
-			</p>
-
-			<p>
-				It lives!<br/>
-				<img src="../images/t60_dev/0071.JPG" alt="" /> <img src="../images/t60_dev/0072.JPG" alt="" /> <img src="../images/t60_dev/0073.JPG" alt="" />
-			</p>
-
-			<p>
-				Always stress test ('stress -c 2' and xsensors. below 90C is ok) when replacing cpu paste/heatsink:<br/>
-				<img src="../images/t60_dev/0074.JPG" alt="" />
-			</p>
-			
-	</div>
-
-	<div class="section">
-		<h2>
-			Not covered yet:
-		</h2>	
-			<ul>
-				<li>Disable flashing the ethernet firmware</li>
-				<li>Disable SPI flash writes (can be re-enabled by unsoldering two parts)</li>
-				<li>Disable use of xrandr/edid on external monitor (cut 2 pins on VGA)</li>
-				<li>Disable docking station (might be possible to do it in software, in coreboot upstream as a Kconfig option)</li>
-			</ul>
-			<p>
-				Go to <a href="http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html">http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html</a>
-				or directly to the video: <a href="http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm">http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm</a>.
-			</p>
-			<p>
-				A lot of this tutorial is based on that video. Look towards the second half of the video to see how to do the above.
-			</p>
-	</div>
-
-	<div class="section">
-		<h2>
-			Also not covered yet:
-		</h2>
-			<ul>
-				<li>
-					Intrusion detection: randomized seal on screws<br/>
-					Just put nail polish with lot of glider on the important screws, take
-					some good pictures. Keep the pictueres and make sure of their integrity.
-					Compare the nail polish with the pictures before powering on the laptop.
-				</li>
-				<li>
-					Tips about preventing/mitigating risk of cold boot attack.
-					<ul>
-						<li>soldered RAM?</li>
-						<li>wipe all RAM at boot/power-off/power-on? (patch in coreboot upstream?)</li>
-						<li>ask gnutoo about fallback patches (counts number of boots)</li>
-					</ul>
-				</li>
-				<li>
-					General tips/advice and web links showing how to detect physical intrusions.
-				</li>
-				<li>
-					For example: <a href="http://cs.tau.ac.il/~tromer/acoustic/">http://cs.tau.ac.il/~tromer/acoustic/</a>
-					or <a href="http://cyber.bgu.ac.il/content/how-leak-sensitive-data-isolated-computer-air-gap-near-mobile-phone-airhopper">http://cyber.bgu.ac.il/content/how-leak-sensitive-data-isolated-computer-air-gap-near-mobile-phone-airhopper</a>.
-				</li>
-				<li>
-					<a href="https://en.wikipedia.org/wiki/Tempest_%28codename%29">https://en.wikipedia.org/wiki/Tempest_%28codename%29</a>
-				</li>
-				<li>
-					https://gitorious.org/gnutoo-for-coreboot/grub-assemble/source/a61f636797777a742f65f4c9c58032aa6a9b23c3:
-				</li>
-			</ul>
-	</div>
-
-	<div class="section">
-		<h1>
-			Extra notes
-		</h1>
-			<p>
-				EC: Cannot be removed but can be mitigated: it contains non-free
-				non-loadable code, but it has no access to the computer's RAM.
-				It has access to the on-switch of the wifi, bluetooth, modem and some
-				other power management features. The issue is that it has access to the
-				keyboard, however if the software security howto <b>(not yet written)</b> is followed correctly,
-				it won't be able to leak data to a local attacker. It has no network
-				access but it may still be able to leak data remotely, but that
-				requires someone to be nearby to recover the data with the help of an
-				SDR and some directional antennas<a href="#ref3">[3]</a>.
-			</p>
-			<p>
-				<a href="http://www.coreboot.org/Intel_82573_Ethernet_controller">Intel 82573 Ethernet controller</a>
-				on the X60 seems safe, according to Denis. 
-			</p>
-
-			<div class="subsection">
-				<h2>
-					Risk level
-				</h2>
-					<ul>
-						<li>Modem (3g/wwan): highest</li>
-						<li>Intel wifi: Near highest</li>
-						<li>Atheros PCI wifi: unknown, but lower than intel wifi.</li>
-						<li>Microphone: only problematic if the computer gets compromised.</li>
-						<li>Speakers: only problematic if the computer gets compromised.</li>
-						<li>EC: can be mitigated if following the guide on software security.</li>
-					</ul>
-			</div>
-	</div>
-
-	<div class="section">
-		<h1>
-			Further reading material (software security)
-		</h1>
-			<ul>
-				<li><a href="../gnulinux/encrypted_trisquel.html">Installing Trisquel GNU/Linux with full disk encryption (including /boot)</a></li>
-				<li><a href="../gnulinux/encrypted_parabola.html">Installing Parabola GNU/Linux with full disk encryption (including /boot)</a></li>
-				<li><a href="dock.html">Notes about DMA access and the docking station</a></li>
-			</ul>
-	</div>
-
-	<div class="section">
-		<h1>
-			References
-		</h1>
-			<div class="subsection">
-				<h2 id="ref1">[1] physical access</h2>
-					<p>
-						Explain that black hats, TAO, and so on might use a 0day to get in,
-						and explain that in this case it mitigates what the attacker can do.
-						Also the TAO do some evaluation before launching an attack: they take
-						the probability of beeing caught into account, along with the kind of
-						target. A 0day costs a lot of money, I heard that it was from 100000$
-						to 400000$, some other websites had prices 10 times lower but that
-						but it was probably a typo. So if people increase their security it
-						makes it more risky and more costly to attack people.
-					</p>
-			</div>
-			<div class="subsection">
-				<h2 id="ref2">[2] microphone</h2>
-					<p>
-						It's possible to turn headphones into a microphone, you could try
-						yourself, however they don't record loud at all. Also intel cards have
-						the capability to change a connector's function, for instance the
-						microphone jack can now become a headphone plug, that's called
-						retasking. There is some support for it in GNU/Linux but it's not very
-						well known.
-					</p>
-			</div>
-			<div class="subsection">
-				<h2 id="ref3">[3] Video (CCC)</h2>
-					<p>
-						30c3-5356-en-Firmware_Fat_Camp_webm.webm from the 30th CCC. While
-						their demo is experimental(their hardware also got damaged during the
-						transport), the spies probably already have that since a long time.
-						<a href="http://berlin.ftp.media.ccc.de/congress/2013/webm/30c3-5356-en-Firmware_Fat_Camp_webm.webm">http://berlin.ftp.media.ccc.de/congress/2013/webm/30c3-5356-en-Firmware_Fat_Camp_webm.webm</a>
-					</p>
-			</div>
-	</div>
-
-	<div class="section">
-
-		<p>
-			Copyright &copy;  2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
-			Permission is granted to copy, distribute and/or modify this document
-			under the terms of the GNU Free Documentation License, Version 1.3
-			or any later version published by the Free Software Foundation;
-			with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-			A copy of the license can be found at <a href="../gfdl-1.3.txt">../gfdl-1.3.txt</a>
-		</p>
-
-		<p>
-			Updated versions of the license (when available) can be found at
-			<a href="https://www.gnu.org/licenses/licenses.html">https://www.gnu.org/licenses/licenses.html</a>
-		</p>
-
-		<p>
-			UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-			EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-			AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-			ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-			IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-			WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-			PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-			ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-			KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-			ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-		</p>
-		<p>
-			TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-			TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-			NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-			INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-			COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-			USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-			ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-			DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-			IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-		</p>
-		<p>
-			The disclaimer of warranties and limitation of liability provided
-			above shall be interpreted in a manner that, to the extent
-			possible, most closely approximates an absolute disclaimer and
-			waiver of all liability.
-		</p>
-		
-	</div>
-
-</body>
-</html>
diff --git a/docs/security/t60_security.texi b/docs/security/t60_security.texi
new file mode 100644
index 0000000..f86b138
--- /dev/null
+++ b/docs/security/t60_security.texi
@@ -0,0 +1,284 @@
+\input texinfo
+@documentencoding UTF-8
+
+@ifnottex
+@paragraphindent 0
+@end ifnottex
+@titlepage
+@title Libreboot documentation: Security on the ThinkPad T60
+@end titlepage
+
+@node Top
+@top Libreboot documentation: Security on the ThinkPad T60
+
+@menu
+* Security on the ThinkPad T60::
+* Table of Contents::
+* Hardware requirements::
+* Software requirements::
+* Rationale::
+* Disassembly::
+* Extra notes::
+* Further reading material software security::
+* References::
+@end menu
+
+@node Security on the ThinkPad T60
+@chapter Security on the ThinkPad T60
+@anchor{#security-on-the-thinkpad-t60}
+Hardware modifications to enhance security on the ThinkPad T60. This tutorial is @strong{incomplete} at the time of writing.
+
+@uref{index.html,Back to previous index}
+
+@node Table of Contents
+@chapter Table of Contents
+@anchor{#table-of-contents}
+@itemize
+@item
+@ref{#hardware_requirements,Hardware Requirements}
+@item
+@ref{#software_requirements,Software Requirements}
+@item
+@ref{#procedure,The procedure}
+@end itemize
+
+@node Hardware requirements
+@chapter Hardware requirements
+@anchor{#hardware-requirements}
+@itemize
+@item
+A T60
+@item
+screwdriver
+@item
+Rubbing or isopropyl alcohol, and thermal compound.
+@item
+(in a later version of this tutorial: soldering iron and scalpel)
+@end itemize
+
+@node Software requirements
+@chapter Software requirements
+@anchor{#software-requirements}
+@itemize
+@item
+none (at least in the scope of the article as-is)
+@item
+You probably want to encrypt your GNU/Linux install using LUKS
+@end itemize
+
+@node Rationale
+@chapter Rationale
+@anchor{#rationale}
+Most people think of security on the software side: the hardware is important aswell.
+
+This tutorial deals with reducing the number of devices that have direct memory access that could communicate with inputs/outputs that could be used to remotely command the system (or leak data). All of this is purely theoretical for the time being.
+
+@node Disassembly
+@chapter Disassembly
+@anchor{#disassembly}
+Remove those screws and remove the HDD:@* @image{../images/t60_dev/0001,,,,JPG} @image{../images/t60_dev/0002,,,,JPG}
+
+Lift off the palm rest:@* @image{../images/t60_dev/0003,,,,JPG}
+
+Lift up the keyboard, pull it back a bit, flip it over like that and then disconnect it from the board:@* @image{../images/t60_dev/0004,,,,JPG} @image{../images/t60_dev/0005,,,,JPG} @image{../images/t60_dev/0006,,,,JPG}
+
+Gently wedge both sides loose:@* @image{../images/t60_dev/0007,,,,JPG} @image{../images/t60_dev/0008,,,,JPG}
+
+Remove that cable from the position:@* @image{../images/t60_dev/0009,,,,JPG} @image{../images/t60_dev/0010,,,,JPG}
+
+Now remove that bezel. Remove wifi, nvram battery and speaker connector (also remove 56k modem, on the left of wifi):@* @image{../images/t60_dev/0011,,,,JPG}@* Reason: has direct (and very fast) memory access, and could (theoretically) leak data over a side-channel.@* @strong{Wifi:} The ath5k/ath9k cards might not have firmware at all. They might safe but could have access to the computer's RAM trough DMA. If people have an intel card(most T60 laptops come with Intel wifi by default, until you change it),then that card runs a non-free firwamre and has access to the computer's RAM trough DMA! So the risk-level is very high.
+
+Remove those screws:@* @image{../images/t60_dev/0012,,,,JPG}
+
+Disconnect the power jack:@* @image{../images/t60_dev/0013,,,,JPG}
+
+Remove nvram battery (we will put it back later):@* @image{../images/t60_dev/0014,,,,JPG}
+
+Disconnect cable (for 56k modem) and disconnect the other cable:@* @image{../images/t60_dev/0015,,,,JPG} @image{../images/t60_dev/0016,,,,JPG}
+
+Disconnect speaker cable:@* @image{../images/t60_dev/0017,,,,JPG}
+
+Disconnect the other end of the 56k modem cable:@* @image{../images/t60_dev/0018,,,,JPG}
+
+Make sure you removed it:@* @image{../images/t60_dev/0019,,,,JPG}
+
+Unscrew those:@* @image{../images/t60_dev/0020,,,,JPG}
+
+Make sure you removed those:@* @image{../images/t60_dev/0021,,,,JPG}
+
+Disconnect LCD cable from board:@* @image{../images/t60_dev/0022,,,,JPG}
+
+Remove those screws then remove the LCD assembly:@* @image{../images/t60_dev/0023,,,,JPG} @image{../images/t60_dev/0024,,,,JPG} @image{../images/t60_dev/0025,,,,JPG}
+
+Once again, make sure you removed those:@* @image{../images/t60_dev/0026,,,,JPG}
+
+Remove the shielding containing the motherboard, then flip it over. Remove these screws, placing them on a steady surface in the same layout as they were in before you removed them. Also, you should mark each screw hole after removing the screw (a permanent marker pen will do), this is so that you have a point of reference when re-assembling the system:@* @image{../images/t60_dev/0027,,,,JPG} @image{../images/t60_dev/0028,,,,JPG} @image{../images/t60_dev/0029,,,,JPG} @image{../images/t60_dev/0031,,,,JPG} @image{../images/t60_dev/0032,,,,JPG} @image{../images/t60_dev/0033,,,,JPG}
+
+Remove microphone (soldering iron not needed. Just wedge it out gently):@* @image{../images/t60_dev/0039,,,,JPG}@* @strong{Rationale:}@* Another reason to remove the microphone: If your computer gets@ref{#ref1,[1]} compromised, it can record what you say, and use it to receive data from nearby devices if they're compromised too. Also, we do not know what the built-in microcode (in the CPU) is doing; it could theoretically be programmed to accept remote commands from some speaker somewhere (remote security hole). @strong{In other words, the system could already be compromised from the factory.}
+
+Remove infrared:@* @image{../images/t60_dev/0040,,,,JPG} @image{../images/t60_dev/0042,,,,JPG}
+
+Remove cardbus (it's in a socket, no need to disable. Just remove the port itself):@* @image{../images/t60_dev/0041,,,,JPG}@* @strong{Rationale:}@* It has direct memory access and can be used to extract sensitive details (such as LUKS keys). See 'GoodBIOS' video linked at the end (speaker is Peter Stuge, a coreboot hacker). The video covers X60 but the same topics apply to T60.
+
+Before re-installing the upper chassis, remove the speaker:@* @image{../images/t60_dev/0043,,,,JPG} @image{../images/t60_dev/0044,,,,JPG}@* Reason: combined with the microphone issue, this could be used to leak data.@* If your computer gets@ref{#ref1,[1]} compromised, it can be used to transmit data to nearby compromised devices. It's unknown if it can be turned into a microphone@ref{#ref2,[2]}.@* Replacement: headphones/speakers (line-out) or external DAC (USB).
+
+Remove the wwan:@* @image{../images/t60_dev/0045,,,,JPG}@* @strong{Wwan (3g modem):} They run proprietary software! It's like AMT but over the GSM network which is probably even worse.@* Replacement: external USB wifi dongle. (or USB wwan/3g dongle; note, this has all the same privacy issues as mobile phones. wwan not recommended).
+
+This is where the simcard connector is soldered. See notes above about wwan. Remove simcard by removing battery and then it's accessible (so, remember to do this when you re-assemble. or you could do it now?)@* @image{../images/t60_dev/0046,,,,JPG}
+
+Put those screws back:@* @image{../images/t60_dev/0047,,,,JPG}
+
+Put it back into lower chassis:@* @image{../images/t60_dev/0048,,,,JPG}
+
+Attach LCD and insert screws (also, attach the lcd cable to the board):@* @image{../images/t60_dev/0049,,,,JPG}
+
+Insert those screws:@* @image{../images/t60_dev/0050,,,,JPG}
+
+On the CPU (and there is another chip south-east to it, sorry forgot to take pic) clean off the old thermal paste (with the alcohol) and apply new (Artic Silver 5 is good, others are good too) you should also clean the heatsink the same way@* @image{../images/t60_dev/0051,,,,JPG}
+
+Attach the heatsink and install the screws (also, make sure to install the AC jack as highlighted):@* @image{../images/t60_dev/0052,,,,JPG}
+
+Reinstall that upper bezel:@* @image{../images/t60_dev/0053,,,,JPG}
+
+Do that:@* @image{../images/t60_dev/0054,,,,JPG} @image{../images/t60_dev/0055,,,,JPG}
+
+Attach keyboard and install nvram battery:@* @image{../images/t60_dev/0056,,,,JPG} @image{../images/t60_dev/0057,,,,JPG}
+
+Place keyboard and (sorry, forgot to take pics) reinstall the palmrest and insert screws on the underside:@* @image{../images/t60_dev/0058,,,,JPG}
+
+Remove those covers and unscrew:@* @image{../images/t60_dev/0059,,,,JPG} @image{../images/t60_dev/0060,,,,JPG} @image{../images/t60_dev/0061,,,,JPG}
+
+Gently pry off the front bezel (sorry, forgot to take pics).
+
+Remove bluetooth module:@* @image{../images/t60_dev/0062,,,,JPG} @image{../images/t60_dev/0063,,,,JPG}
+
+Re-attach the front bezel and re-insert the screws (sorry, forgot to take pics).
+
+It lives!@* @image{../images/t60_dev/0071,,,,JPG} @image{../images/t60_dev/0072,,,,JPG} @image{../images/t60_dev/0073,,,,JPG}
+
+Always stress test ('stress -c 2' and xsensors. below 90C is ok) when replacing cpu paste/heatsink:@* @image{../images/t60_dev/0074,,,,JPG}
+@menu
+* Not covered yet::
+* Also not covered yet::
+@end menu
+
+@node Not covered yet
+@section Not covered yet:
+@anchor{#not-covered-yet}
+@itemize
+@item
+Disable flashing the ethernet firmware
+@item
+Disable SPI flash writes (can be re-enabled by unsoldering two parts)
+@item
+Disable use of xrandr/edid on external monitor (cut 2 pins on VGA)
+@item
+Disable docking station (might be possible to do it in software, in coreboot upstream as a Kconfig option)
+@end itemize
+
+Go to @uref{http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html,http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html} or directly to the video: @uref{http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm,http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm}.
+
+A lot of this tutorial is based on that video. Look towards the second half of the video to see how to do the above.
+
+@node Also not covered yet
+@section Also not covered yet:
+@anchor{#also-not-covered-yet}
+@itemize
+@item
+Intrusion detection: randomized seal on screws@* Just put nail polish with lot of glider on the important screws, take some good pictures. Keep the pictueres and make sure of their integrity. Compare the nail polish with the pictures before powering on the laptop.
+@item
+Tips about preventing/mitigating risk of cold boot attack.
+@itemize
+@item
+soldered RAM?
+@item
+wipe all RAM at boot/power-off/power-on? (patch in coreboot upstream?)
+@item
+ask gnutoo about fallback patches (counts number of boots)
+@end itemize
+
+@item
+General tips/advice and web links showing how to detect physical intrusions.
+@item
+For example: @uref{http://cs.tau.ac.il/~tromer/acoustic/,http://cs.tau.ac.il/~tromer/acoustic/} or @uref{http://cyber.bgu.ac.il/content/how-leak-sensitive-data-isolated-computer-air-gap-near-mobile-phone-airhopper,http://cyber.bgu.ac.il/content/how-leak-sensitive-data-isolated-computer-air-gap-near-mobile-phone-airhopper}.
+@item
+@uref{https://en.wikipedia.org/wiki/Tempest_%28codename%29,https://en.wikipedia.org/wiki/Tempest_%28codename%29}
+@item
+https://gitorious.org/gnutoo-for-coreboot/grub-assemble/source/a61f636797777a742f65f4c9c58032aa6a9b23c3:
+@end itemize
+
+@node Extra notes
+@chapter Extra notes
+@anchor{#extra-notes}
+EC: Cannot be removed but can be mitigated: it contains non-free non-loadable code, but it has no access to the computer's RAM. It has access to the on-switch of the wifi, bluetooth, modem and some other power management features. The issue is that it has access to the keyboard, however if the software security howto @strong{(not yet written)} is followed correctly, it won't be able to leak data to a local attacker. It has no network access but it may still be able to leak data remotely, but that requires someone to be nearby to recover the data with the help of an SDR and some directional antennas@ref{#ref3,[3]}.
+
+@uref{http://www.coreboot.org/Intel_82573_Ethernet_controller,Intel 82573 Ethernet controller} on the X60 seems safe, according to Denis.
+@menu
+* Risk level::
+@end menu
+
+@node Risk level
+@section Risk level
+@anchor{#risk-level}
+@itemize
+@item
+Modem (3g/wwan): highest
+@item
+Intel wifi: Near highest
+@item
+Atheros PCI wifi: unknown, but lower than intel wifi.
+@item
+Microphone: only problematic if the computer gets compromised.
+@item
+Speakers: only problematic if the computer gets compromised.
+@item
+EC: can be mitigated if following the guide on software security.
+@end itemize
+
+@node Further reading material software security
+@chapter Further reading material (software security)
+@anchor{#further-reading-material-software-security}
+@itemize
+@item
+@uref{../gnulinux/encrypted_trisquel.html,Installing Trisquel GNU/Linux with full disk encryption (including /boot)}
+@item
+@uref{../gnulinux/encrypted_parabola.html,Installing Parabola GNU/Linux with full disk encryption (including /boot)}
+@item
+@uref{dock.html,Notes about DMA access and the docking station}
+@end itemize
+
+@node References
+@chapter References
+@anchor{#references}
+@menu
+* [1] physical access::
+* [2] microphone::
+* [3] Video CCC::
+@end menu
+
+@node [1] physical access
+@section [1] physical access
+@anchor{#physical-access}
+Explain that black hats, TAO, and so on might use a 0day to get in, and explain that in this case it mitigates what the attacker can do. Also the TAO do some evaluation before launching an attack: they take the probability of beeing caught into account, along with the kind of target. A 0day costs a lot of money, I heard that it was from 100000$ to 400000$, some other websites had prices 10 times lower but that but it was probably a typo. So if people increase their security it makes it more risky and more costly to attack people.
+
+@node [2] microphone
+@section [2] microphone
+@anchor{#microphone}
+It's possible to turn headphones into a microphone, you could try yourself, however they don't record loud at all. Also intel cards have the capability to change a connector's function, for instance the microphone jack can now become a headphone plug, that's called retasking. There is some support for it in GNU/Linux but it's not very well known.
+
+@node [3] Video CCC
+@section [3] Video (CCC)
+@anchor{#video-ccc}
+30c3-5356-en-Firmware_Fat_Camp_webm.webm from the 30th CCC. While their demo is experimental(their hardware also got damaged during the transport), the spies probably already have that since a long time. @uref{http://berlin.ftp.media.ccc.de/congress/2013/webm/30c3-5356-en-Firmware_Fat_Camp_webm.webm,http://berlin.ftp.media.ccc.de/congress/2013/webm/30c3-5356-en-Firmware_Fat_Camp_webm.webm}
+
+Copyright © 2014, 2015 Francis Rowe <info@@gluglug.org.uk>@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found at @uref{../gfdl-1.3.txt,../gfdl-1.3.txt}
+
+Updated versions of the license (when available) can be found at @uref{https://www.gnu.org/licenses/licenses.html,https://www.gnu.org/licenses/licenses.html}
+
+UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+@bye
diff --git a/docs/security/x60_security.html b/docs/security/x60_security.html
deleted file mode 100644
index 456be72..0000000
--- a/docs/security/x60_security.html
+++ /dev/null
@@ -1,344 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-
-	<style type="text/css">
-		@import url('../css/main.css');
-	</style>
-
-	<title>Libreboot documentation: Security on the ThinkPad X60</title>
-</head>
-
-<body>
-
-	<div class="section">
-		<h1>Security on the ThinkPad X60</h1>
-			<p>Hardware modifications to enhance security on the ThinkPad X60. This tutorial is <b>incomplete</b> at the time of writing.</p>
-			<p><a href="index.html">Back to previous index</a></p>
-	</div>
-
-	<div class="section">
-		<h1>Table of Contents</h1>
-			<ul>
-				<li><a href="#hardware_requirements">Hardware Requirements</a></li>
-				<li><a href="#software_requirements">Software Requirements</a></li>
-				<li><a href="#procedure">The procedure</a></li>
-			</ul>
-	</div>
-
-	<div class="section">
-		
-		<h1 id="hardware_requirements">Hardware requirements</h1>
-			<ul>
-				<li>An X60</li>
-				<li>screwdriver</li>
-				<li>(in a later version of this tutorial: soldering iron and scalpel)</li>
-			</ul>
-
-		<h1 id="software_requirements">Software requirements</h1>
-			<ul>
-				<li>none (at least in the scope of the article as-is)</li>
-				<li>You probably want to encrypt your GNU/Linux install using LUKS</li>
-			</ul>
-			
-	</div>
-
-	<div class="section">
-
-		<h1>
-			Rationale
-		</h1>
-			<p>
-				Most people think of security on the software side: the hardware is important aswell.
-			</p>
-			<p>
-				This tutorial deals with reducing the number of devices that have direct memory access that
-				could communicate with inputs/outputs that could be used to remotely
-				command the system (or leak data). All of this is purely theoretical for the time being.
-			</p>
-
-		<h1 id="procedure">Disassembly</h1>
-
-			<p>
-				Firstly remove the bluetooth (if your X60 has this):<br/>
-				The marked screws are underneath those stickers (marked in those 3 locations at the bottom of the LCD assembly):<br/>
-				<img src="../images/x60_security/0000_bluetooth0.jpg" alt="" /><br/>
-				Now gently pry off the bottom part of the front bezel, and the bluetooth module is on the left (easily removable):<br/>
-				<img src="../images/x60_security/0000_bluetooth.jpg" alt="" /><br/>
-			</p>
-
-			<p>
-				If your model was WWAN, remove the simcard (check anyway):<br/>
-				Uncover those 2 screws at the bottom:<br/>
-				<img src="../images/x60_security/0000_simcard0.jpg" alt="" /><br/>
-				SIM card (not present in the picture) is in the marked location:<br/>
-				<img src="../images/x60_security/0000_simcard1.jpg" alt="" /><br/>
-				Replacement: USB dongle.
-			</p>
-
-			<p>
-				Now get into the motherboard.
-			</p>
-
-			<p>
-				Remove those screws:<br/>
-				<img src="../images/x60_security/0000.jpg" alt="" />
-			</p>
-			<p>
-				Push the keyboard forward (carefully):<br/>
-				<img src="../images/x60_security/0001.jpg" alt="" />
-			</p>
-			<p>
-				Lift the keyboard up and disconnect it from the board:<br/>
-				<img src="../images/x60_security/0002.jpg" alt="" />
-			</p>
-			<p>
-				Grab the right-hand side of the chassis and force it off (gently) and pry up the rest of the chassis:<br/>
-				<img src="../images/x60_security/0003.jpg" alt="" />
-			</p>
-			<p>
-				You should now have this:<br/>
-				<img src="../images/x60_security/0004.jpg" alt="" />
-			</p>
-
-			<p>
-				The following is a summary of what you will remove (already done to this system):<br/>
-				<img src="../images/x60_security/0001_overview.jpg" alt="" /><br/>
-				Note: the blue lines represent antenna cables and modem cables. You don't need to remove these, but you can if you want
-				(to make it tidier after removing other parts). I removed the antenna wires, the modem jack, the modem cable and
-				also (on another model) a device inside the part where the wwan antenna goes (wasn't sure what it was, but I knew it wasn't needed). <b>This is optional</b>
-			</p>
-
-			<p>
-				Remove the microphone (can desolder it, but you can also easily pull it off with you hands). Already removed here:<br/>
-				<img src="../images/x60_security/0001_microphone.jpg" alt="" /><br/>
-				<b>Rationale:</b><br/>
-				Another reason to remove the microphone: If your computer gets<a href="#ref1">[1]</a> compromised, it can
-				record what you say, and use it to receive data from nearby devices if
-				they're compromised too. Also, we do not know what the built-in microcode (in the CPU) is doing; it could theoretically
-				be programmed to accept remote commands from some speaker somewhere (remote security hole). <b>In other words,
-				the system could already be compromised from the factory.</b>
-			</p>
-
-			<p>
-				Remove the modem:<br/>
-				<img src="../images/x60_security/0001_modem.jpg" alt="" /><br/>
-				(useless, obsolete device)
-			</p>
-
-			<p>
-				Remove the speaker:<br/>
-				<img src="../images/x60_security/0001_speaker.jpg" alt="" /><br/>
-				Reason: combined with the microphone issue, this could be used to leak data.<br/>
-				If your computer gets<a href="#ref1">[1]</a> compromised, it can be used to
-				transmit data to nearby compromised devices. It's unknown if it can be
-				turned into a microphone<a href="#ref2">[2]</a>.<br/>
-				Replacement: headphones/speakers (line-out) or external DAC (USB).
-			</p>
-
-			<p>
-				Remove the wlan (also remove wwan if you have it):<br/>
-				<img src="../images/x60_security/0001_wlan_wwan.jpg" alt="" /><br/>
-				Reason: has direct (and very fast) memory access, and could (theoretically) leak data over a side-channel.<br/>
-				<b>Wifi:</b> The ath5k/ath9k cards might not have firmware at all. They might safe but could have
-				access to the computer's RAM trough DMA. If people have an intel
-				card(most X60s come with Intel wifi by default, until you change it),then that card runs
-				a non-free firwamre and has access to the computer's RAM trough DMA! So
-				the risk-level is very high.<br/>
-				<b>Wwan (3g modem):</b> They run proprietary software! It's like AMT but over the GSM network which is
-				probably even worse.<br/>
-				Replacement: external USB wifi dongle. (or USB wwan/3g dongle; note, this has all the same privacy issues as mobile phones. wwan not recommended).
-			</p>	
-
-			<h2>
-				Not covered yet:
-			</h2>	
-				<ul>
-					<li>Disable cardbus (has fast/direct memory access)</li>
-					<li>Disable firewire (has fast/direct memory access)</li>
-					<li>Disable flashing the ethernet firmware</li>
-					<li>Disable SPI flash writes (can be re-enabled by unsoldering two parts)</li>
-					<li>Disable use of xrandr/edid on external monitor (cut 2 pins on VGA)</li>
-					<li>Disable docking station (might be possible to do it in software, in coreboot upstream as a Kconfig option)</li>
-				</ul>
-				<p>
-					Go to <a href="http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html">http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html</a>
-					or directly to the video: <a href="http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm">http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm</a>.
-				</p>
-				<p>
-					A lot of this tutorial is based on that video. Look towards the second half of the video to see how to do the above.
-				</p>
-
-			<h2>
-				Also not covered yet:
-			</h2>
-				<ul>
-					<li>
-						Intrusion detection: randomized seal on screws<br/>
-						Just put nail polish with lot of glider on the important screws, take
-						some good pictures. Keep the pictueres and make sure of their integrity.
-						Compare the nail polish with the pictures before powering on the laptop.
-					</li>
-					<li>
-						Tips about preventing/mitigating risk of cold boot attack.
-						<ul>
-							<li>soldered RAM?</li>
-							<li>seal RAM door shut (possibly modified lower chassis) so that system has to be disassembled (which has to go through the nail polish)</li>
-							<li>wipe all RAM at boot/power-off/power-on? (patch in coreboot upstream?)</li>
-							<li>ask gnutoo about fallback patches (counts number of boots)</li>
-						</ul>
-					</li>
-					<li>
-						General tips/advice and web links showing how to detect physical intrusions.
-					</li>
-					<li>
-						For example: <a href="http://cs.tau.ac.il/~tromer/acoustic/">http://cs.tau.ac.il/~tromer/acoustic/</a>
-						or <a href="http://cyber.bgu.ac.il/content/how-leak-sensitive-data-isolated-computer-air-gap-near-mobile-phone-airhopper">http://cyber.bgu.ac.il/content/how-leak-sensitive-data-isolated-computer-air-gap-near-mobile-phone-airhopper</a>.
-					</li>
-					<li>
-						<a href="https://en.wikipedia.org/wiki/Tempest_%28codename%29">https://en.wikipedia.org/wiki/Tempest_%28codename%29</a>
-					</li>
-					<li>
-						https://gitorious.org/gnutoo-for-coreboot/grub-assemble/source/a61f636797777a742f65f4c9c58032aa6a9b23c3:
-					</li>
-				</ul>
-				
-	</div>
-
-	<div class="section">
-		<h1>
-			Extra notes
-		</h1>
-			<p>
-				EC: Cannot be removed but can be mitigated: it contains non-free
-				non-loadable code, but it has no access to the computer's RAM.
-				It has access to the on-switch of the wifi, bluetooth, modem and some
-				other power management features. The issue is that it has access to the
-				keyboard, however if the software security howto <b>(not yet written)</b> is followed correctly,
-				it won't be able to leak data to a local attacker. It has no network
-				access but it may still be able to leak data remotely, but that
-				requires someone to be nearby to recover the data with the help of an
-				SDR and some directional antennas<a href="#ref3">[3]</a>.
-			</p>
-			<p>
-				<a href="http://www.coreboot.org/Intel_82573_Ethernet_controller">Intel 82573 Ethernet controller</a>
-				on the X60 seems safe, according to Denis. 
-			</p>
-
-			<div class="subsection">
-				<h2>
-					Risk level
-				</h2>
-					<ul>
-						<li>Modem (3g/wwan): highest</li>
-						<li>Intel wifi: Near highest</li>
-						<li>Atheros PCI wifi: unknown, but lower than intel wifi.</li>
-						<li>Microphone: only problematic if the computer gets compromised.</li>
-						<li>Speakers: only problematic if the computer gets compromised.</li>
-						<li>EC: can be mitigated if following the guide on software security.</li>
-					</ul>
-			</div>
-	</div>
-
-	<div class="section">
-		<h1>
-			Further reading material (software security)
-		</h1>
-			<ul>
-				<li><a href="../gnulinux/encrypted_trisquel.html">Installing Trisquel GNU/Linux with full disk encryption (including /boot)</a></li>
-				<li><a href="../gnulinux/encrypted_parabola.html">Installing Parabola GNU/Linux with full disk encryption (including /boot)</a></li>
-				<li><a href="dock.html">Notes about DMA access and the docking station</a></li>
-			</ul>
-	</div>
-
-	<div class="section">
-		<h1>
-			References
-		</h1>
-			<div class="subsection">
-				<h2 id="ref1">[1] physical access</h2>
-					<p>
-						Explain that black hats, TAO, and so on might use a 0day to get in,
-						and explain that in this case it mitigates what the attacker can do.
-						Also the TAO do some evaluation before launching an attack: they take
-						the probability of beeing caught into account, along with the kind of
-						target. A 0day costs a lot of money, I heard that it was from 100000$
-						to 400000$, some other websites had prices 10 times lower but that
-						but it was probably a typo. So if people increase their security it
-						makes it more risky and more costly to attack people.
-					</p>
-			</div>
-			<div class="subsection">
-				<h2 id="ref2">[2] microphone</h2>
-					<p>
-						It's possible to turn headphones into a microphone, you could try
-						yourself, however they don't record loud at all. Also intel cards have
-						the capability to change a connector's function, for instance the
-						microphone jack can now become a headphone plug, that's called
-						retasking. There is some support for it in GNU/Linux but it's not very
-						well known.
-					</p>
-			</div>
-			<div class="subsection">
-				<h2 id="ref3">[3] Video (CCC)</h2>
-					<p>
-						30c3-5356-en-Firmware_Fat_Camp_webm.webm from the 30th CCC. While
-						their demo is experimental(their hardware also got damaged during the
-						transport), the spies probably already have that since a long time.
-						<a href="http://berlin.ftp.media.ccc.de/congress/2013/webm/30c3-5356-en-Firmware_Fat_Camp_webm.webm">http://berlin.ftp.media.ccc.de/congress/2013/webm/30c3-5356-en-Firmware_Fat_Camp_webm.webm</a>
-					</p>
-			</div>
-	</div>
-
-	<div class="section">
-
-		<p>
-			Copyright &copy;  2014, 2015 Francis Rowe &lt;info@gluglug.org.uk&gt;<br/>
-			Permission is granted to copy, distribute and/or modify this document
-			under the terms of the GNU Free Documentation License, Version 1.3
-			or any later version published by the Free Software Foundation;
-			with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-			A copy of the license can be found at <a href="../gfdl-1.3.txt">../gfdl-1.3.txt</a>
-		</p>
-
-		<p>
-			Updated versions of the license (when available) can be found at
-			<a href="https://www.gnu.org/licenses/licenses.html">https://www.gnu.org/licenses/licenses.html</a>
-		</p>
-
-		<p>
-			UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-			EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-			AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-			ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-			IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-			WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-			PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-			ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-			KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-			ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-		</p>
-		<p>
-			TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-			TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-			NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-			INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-			COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-			USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-			ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-			DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-			IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-		</p>
-		<p>
-			The disclaimer of warranties and limitation of liability provided
-			above shall be interpreted in a manner that, to the extent
-			possible, most closely approximates an absolute disclaimer and
-			waiver of all liability.
-		</p>
-		
-	</div>
-
-</body>
-</html>
diff --git a/docs/security/x60_security.texi b/docs/security/x60_security.texi
new file mode 100644
index 0000000..d903bf8
--- /dev/null
+++ b/docs/security/x60_security.texi
@@ -0,0 +1,232 @@
+\input texinfo
+@documentencoding UTF-8
+
+@ifnottex
+@paragraphindent 0
+@end ifnottex
+@titlepage
+@title Libreboot documentation: Security on the ThinkPad X60
+@end titlepage
+
+@node Top
+@top Libreboot documentation: Security on the ThinkPad X60
+
+@menu
+* Security on the ThinkPad X60::
+* Table of Contents::
+* Hardware requirements::
+* Software requirements::
+* Rationale::
+* Disassembly::
+* Extra notes::
+* Further reading material software security::
+* References::
+@end menu
+
+@node Security on the ThinkPad X60
+@chapter Security on the ThinkPad X60
+@anchor{#security-on-the-thinkpad-x60}
+Hardware modifications to enhance security on the ThinkPad X60. This tutorial is @strong{incomplete} at the time of writing.
+
+@uref{index.html,Back to previous index}
+
+@node Table of Contents
+@chapter Table of Contents
+@anchor{#table-of-contents}
+@itemize
+@item
+@ref{#hardware_requirements,Hardware Requirements}
+@item
+@ref{#software_requirements,Software Requirements}
+@item
+@ref{#procedure,The procedure}
+@end itemize
+
+@node Hardware requirements
+@chapter Hardware requirements
+@anchor{#hardware-requirements}
+@itemize
+@item
+An X60
+@item
+screwdriver
+@item
+(in a later version of this tutorial: soldering iron and scalpel)
+@end itemize
+
+@node Software requirements
+@chapter Software requirements
+@anchor{#software-requirements}
+@itemize
+@item
+none (at least in the scope of the article as-is)
+@item
+You probably want to encrypt your GNU/Linux install using LUKS
+@end itemize
+
+@node Rationale
+@chapter Rationale
+@anchor{#rationale}
+Most people think of security on the software side: the hardware is important aswell.
+
+This tutorial deals with reducing the number of devices that have direct memory access that could communicate with inputs/outputs that could be used to remotely command the system (or leak data). All of this is purely theoretical for the time being.
+
+@node Disassembly
+@chapter Disassembly
+@anchor{#disassembly}
+Firstly remove the bluetooth (if your X60 has this):@* The marked screws are underneath those stickers (marked in those 3 locations at the bottom of the LCD assembly):@* @image{../images/x60_security/0000_bluetooth0,,,,jpg}@* Now gently pry off the bottom part of the front bezel, and the bluetooth module is on the left (easily removable):@* @image{../images/x60_security/0000_bluetooth,,,,jpg}@*
+
+If your model was WWAN, remove the simcard (check anyway):@* Uncover those 2 screws at the bottom:@* @image{../images/x60_security/0000_simcard0,,,,jpg}@* SIM card (not present in the picture) is in the marked location:@* @image{../images/x60_security/0000_simcard1,,,,jpg}@* Replacement: USB dongle.
+
+Now get into the motherboard.
+
+Remove those screws:@* @image{../images/x60_security/0000,,,,jpg}
+
+Push the keyboard forward (carefully):@* @image{../images/x60_security/0001,,,,jpg}
+
+Lift the keyboard up and disconnect it from the board:@* @image{../images/x60_security/0002,,,,jpg}
+
+Grab the right-hand side of the chassis and force it off (gently) and pry up the rest of the chassis:@* @image{../images/x60_security/0003,,,,jpg}
+
+You should now have this:@* @image{../images/x60_security/0004,,,,jpg}
+
+The following is a summary of what you will remove (already done to this system):@* @image{../images/x60_security/0001_overview,,,,jpg}@* Note: the blue lines represent antenna cables and modem cables. You don't need to remove these, but you can if you want (to make it tidier after removing other parts). I removed the antenna wires, the modem jack, the modem cable and also (on another model) a device inside the part where the wwan antenna goes (wasn't sure what it was, but I knew it wasn't needed). @strong{This is optional}
+
+Remove the microphone (can desolder it, but you can also easily pull it off with you hands). Already removed here:@* @image{../images/x60_security/0001_microphone,,,,jpg}@* @strong{Rationale:}@* Another reason to remove the microphone: If your computer gets@ref{#ref1,[1]} compromised, it can record what you say, and use it to receive data from nearby devices if they're compromised too. Also, we do not know what the built-in microcode (in the CPU) is doing; it could theoretically be programmed to accept remote commands from some speaker somewhere (remote security hole). @strong{In other words, the system could already be compromised from the factory.}
+
+Remove the modem:@* @image{../images/x60_security/0001_modem,,,,jpg}@* (useless, obsolete device)
+
+Remove the speaker:@* @image{../images/x60_security/0001_speaker,,,,jpg}@* Reason: combined with the microphone issue, this could be used to leak data.@* If your computer gets@ref{#ref1,[1]} compromised, it can be used to transmit data to nearby compromised devices. It's unknown if it can be turned into a microphone@ref{#ref2,[2]}.@* Replacement: headphones/speakers (line-out) or external DAC (USB).
+
+Remove the wlan (also remove wwan if you have it):@* @image{../images/x60_security/0001_wlan_wwan,,,,jpg}@* Reason: has direct (and very fast) memory access, and could (theoretically) leak data over a side-channel.@* @strong{Wifi:} The ath5k/ath9k cards might not have firmware at all. They might safe but could have access to the computer's RAM trough DMA. If people have an intel card(most X60s come with Intel wifi by default, until you change it),then that card runs a non-free firwamre and has access to the computer's RAM trough DMA! So the risk-level is very high.@* @strong{Wwan (3g modem):} They run proprietary software! It's like AMT but over the GSM network which is probably even worse.@* Replacement: external USB wifi dongle. (or USB wwan/3g dongle; note, this has all the same privacy issues as mobile phones. wwan not recommended).
+@menu
+* Not covered yet::
+* Also not covered yet::
+@end menu
+
+@node Not covered yet
+@section Not covered yet:
+@anchor{#not-covered-yet}
+@itemize
+@item
+Disable cardbus (has fast/direct memory access)
+@item
+Disable firewire (has fast/direct memory access)
+@item
+Disable flashing the ethernet firmware
+@item
+Disable SPI flash writes (can be re-enabled by unsoldering two parts)
+@item
+Disable use of xrandr/edid on external monitor (cut 2 pins on VGA)
+@item
+Disable docking station (might be possible to do it in software, in coreboot upstream as a Kconfig option)
+@end itemize
+
+Go to @uref{http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html,http://media.ccc.de/browse/congress/2013/30C3_-_5529_-_en_-_saal_2_-_201312271830_-_hardening_hardware_and_choosing_a_goodbios_-_peter_stuge.html} or directly to the video: @uref{http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm,http://mirror.netcologne.de/CCC/congress/2013/webm/30c3-5529-en-Hardening_hardware_and_choosing_a_goodBIOS_webm.webm}.
+
+A lot of this tutorial is based on that video. Look towards the second half of the video to see how to do the above.
+
+@node Also not covered yet
+@section Also not covered yet:
+@anchor{#also-not-covered-yet}
+@itemize
+@item
+Intrusion detection: randomized seal on screws@* Just put nail polish with lot of glider on the important screws, take some good pictures. Keep the pictueres and make sure of their integrity. Compare the nail polish with the pictures before powering on the laptop.
+@item
+Tips about preventing/mitigating risk of cold boot attack.
+@itemize
+@item
+soldered RAM?
+@item
+seal RAM door shut (possibly modified lower chassis) so that system has to be disassembled (which has to go through the nail polish)
+@item
+wipe all RAM at boot/power-off/power-on? (patch in coreboot upstream?)
+@item
+ask gnutoo about fallback patches (counts number of boots)
+@end itemize
+
+@item
+General tips/advice and web links showing how to detect physical intrusions.
+@item
+For example: @uref{http://cs.tau.ac.il/~tromer/acoustic/,http://cs.tau.ac.il/~tromer/acoustic/} or @uref{http://cyber.bgu.ac.il/content/how-leak-sensitive-data-isolated-computer-air-gap-near-mobile-phone-airhopper,http://cyber.bgu.ac.il/content/how-leak-sensitive-data-isolated-computer-air-gap-near-mobile-phone-airhopper}.
+@item
+@uref{https://en.wikipedia.org/wiki/Tempest_%28codename%29,https://en.wikipedia.org/wiki/Tempest_%28codename%29}
+@item
+https://gitorious.org/gnutoo-for-coreboot/grub-assemble/source/a61f636797777a742f65f4c9c58032aa6a9b23c3:
+@end itemize
+
+@node Extra notes
+@chapter Extra notes
+@anchor{#extra-notes}
+EC: Cannot be removed but can be mitigated: it contains non-free non-loadable code, but it has no access to the computer's RAM. It has access to the on-switch of the wifi, bluetooth, modem and some other power management features. The issue is that it has access to the keyboard, however if the software security howto @strong{(not yet written)} is followed correctly, it won't be able to leak data to a local attacker. It has no network access but it may still be able to leak data remotely, but that requires someone to be nearby to recover the data with the help of an SDR and some directional antennas@ref{#ref3,[3]}.
+
+@uref{http://www.coreboot.org/Intel_82573_Ethernet_controller,Intel 82573 Ethernet controller} on the X60 seems safe, according to Denis.
+@menu
+* Risk level::
+@end menu
+
+@node Risk level
+@section Risk level
+@anchor{#risk-level}
+@itemize
+@item
+Modem (3g/wwan): highest
+@item
+Intel wifi: Near highest
+@item
+Atheros PCI wifi: unknown, but lower than intel wifi.
+@item
+Microphone: only problematic if the computer gets compromised.
+@item
+Speakers: only problematic if the computer gets compromised.
+@item
+EC: can be mitigated if following the guide on software security.
+@end itemize
+
+@node Further reading material software security
+@chapter Further reading material (software security)
+@anchor{#further-reading-material-software-security}
+@itemize
+@item
+@uref{../gnulinux/encrypted_trisquel.html,Installing Trisquel GNU/Linux with full disk encryption (including /boot)}
+@item
+@uref{../gnulinux/encrypted_parabola.html,Installing Parabola GNU/Linux with full disk encryption (including /boot)}
+@item
+@uref{dock.html,Notes about DMA access and the docking station}
+@end itemize
+
+@node References
+@chapter References
+@anchor{#references}
+@menu
+* [1] physical access::
+* [2] microphone::
+* [3] Video CCC::
+@end menu
+
+@node [1] physical access
+@section [1] physical access
+@anchor{#physical-access}
+Explain that black hats, TAO, and so on might use a 0day to get in, and explain that in this case it mitigates what the attacker can do. Also the TAO do some evaluation before launching an attack: they take the probability of beeing caught into account, along with the kind of target. A 0day costs a lot of money, I heard that it was from 100000$ to 400000$, some other websites had prices 10 times lower but that but it was probably a typo. So if people increase their security it makes it more risky and more costly to attack people.
+
+@node [2] microphone
+@section [2] microphone
+@anchor{#microphone}
+It's possible to turn headphones into a microphone, you could try yourself, however they don't record loud at all. Also intel cards have the capability to change a connector's function, for instance the microphone jack can now become a headphone plug, that's called retasking. There is some support for it in GNU/Linux but it's not very well known.
+
+@node [3] Video CCC
+@section [3] Video (CCC)
+@anchor{#video-ccc}
+30c3-5356-en-Firmware_Fat_Camp_webm.webm from the 30th CCC. While their demo is experimental(their hardware also got damaged during the transport), the spies probably already have that since a long time. @uref{http://berlin.ftp.media.ccc.de/congress/2013/webm/30c3-5356-en-Firmware_Fat_Camp_webm.webm,http://berlin.ftp.media.ccc.de/congress/2013/webm/30c3-5356-en-Firmware_Fat_Camp_webm.webm}
+
+Copyright © 2014, 2015 Francis Rowe <info@@gluglug.org.uk>@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license can be found at @uref{../gfdl-1.3.txt,../gfdl-1.3.txt}
+
+Updated versions of the license (when available) can be found at @uref{https://www.gnu.org/licenses/licenses.html,https://www.gnu.org/licenses/licenses.html}
+
+UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
+
+@bye
author	Francis Rowe <info@gluglug.org.uk>	2015-11-06 17:43:29 (EST)
committer	Francis Rowe <info@gluglug.org.uk>	2015-11-06 23:45:09 (EST)
commit	95259e28ef047923258434898113d70c8e544eab (patch)
tree	1c0501bf4c7df1c31948184dabfc1e7c4c215a6e /docs/security
parent	707f9383a8189b0054730134340f20709f56f976 (diff)
download	libreboot-95259e28ef047923258434898113d70c8e544eab.zip libreboot-95259e28ef047923258434898113d70c8e544eab.tar.gz libreboot-95259e28ef047923258434898113d70c8e544eab.tar.bz2