Added more to the Introduction to PEDA and Pwntools section on PEDA

Author: nnamon

Diff for: .gitignore

@@ -1,3 +1,5 @@
 *.pyc
 .vagrant
 ubuntu-xenial-16.04-cloudimg-console.log
+.gdb_history
+peda-*.txt

Diff for: README.md

@@ -17,7 +17,7 @@ expected of the following topics:
 
 1. [Setting Up the Environment]
 2. How Does a Linux Binary Work?
-3. Introduction to PEDA and Pwntools
+3. [Introduction to PEDA and Pwntools]
 4. Classic Exploitation Theory
 5. Linux Binary Protections
 6. The Classic Exploitation Technique
@@ -33,3 +33,5 @@ expected of the following topics:
 
 
 [Setting Up The Environment]: ./lessons/1_setting_up_environment/lessonplan.md
+[Introduction to PEDA and Pwntools]: ./lessons/3_intro_to_tools/lessonplan.md
+

Diff for: Vagrantfile

@@ -67,12 +67,12 @@ Vagrant.configure("2") do |config|
   config.vm.provision "shell", inline: <<-SHELL
     dpkg --add-architecture i386
     apt-get update
-    apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 gdb python python-pip libssl-dev gcc git
-	 	pip install --upgrade pip
-		pip install pwntools
-		pip install ipython
-		pip install ropper
-		git clone https://github.com/longld/peda.git /home/ubuntu/peda
-		echo "source ~/peda/peda.py" >> /home/ubuntu/.gdbinit
+    apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 gdb python python-pip libssl-dev gcc git binutils socat
+    pip install --upgrade pip
+    pip install pwntools
+    pip install ipython
+    pip install ropper
+    git clone https://github.com/longld/peda.git /home/ubuntu/peda
+    echo "source ~/peda/peda.py" >> /home/ubuntu/.gdbinit
   SHELL
 end

Diff for: lessons/1_setting_up_environment/lessonplan.md

@@ -10,7 +10,9 @@ prepare the testing environment.
 First, install vagrant and virtualbox. Vagrant can be downloaded from [this
 link](vagrantdl). Virtualbox can be downloaded from [here](virtualboxdl).
 
-Next, clone the repository onto your host machine.
+Next, clone the repository onto your host machine. If you have messed up
+somewhere along the course and want to revert the state of the repository, just
+delete the entire directory and perform this step again.
 
 ```shell
 amon@bethany:~$ git clone https://github.com/nnamon/linux-exploitation-course.git
@@ -80,19 +82,57 @@ drwx------ 2 ubuntu ubuntu 4096 Jan  8 10:54 .ssh
 ubuntu@ubuntu-xenial:~$
 ```
 
+The course repository directory you clone previously will be mounted at
+`/vagrant` so you can use your preferred text editor.
+
+## Windows Users
+
+For Windows users there are two options:
+
+1. Start a virtual machine containing Ubuntu 16.04 and run the provisioning
+   script found below. Next, manually clone the course repository into the
+   machine. Note that directory locations may be different from the code
+   listings in the course if you go down this route. The choice of
+   virtualisation software you choose is up to you.
+2. Install Vagrant and Virtualbox for Windows. This allows you to follow the
+   instructions above almost identically.
+
+One caveat with Option 2 is that your Windows Installation might not have SSH
+installed previously. When you invoke `vagrant ssh`, you might receive a message
+as follows:
+
+```shell
+D:\linux-exploitation-course>vagrant ssh
+`ssh` executable not found in any directories in the %PATH% variable. Is an
+SSH client installed? Try installing Cygwin, MinGW or Git, all of which
+contain an SSH client. Or use your favorite SSH client with the following
+authentication information shown below:
+
+Host: 127.0.0.1
+Port: 2222
+Username: ubuntu
+Private key:
+D:/linux-exploitation-course/.vagrant/machines/default/virtualbox/private_key
+```
+
+In that case, simply follow the instructions to SSH into the newly provisioned
+system with an SSH client of your choice such as Putty.
+
 ## What Was Installed?
 
 This is the entire provisioning script:
 
-```ruby
-  config.vm.provision "shell", inline: <<-SHELL
-    dpkg --add-architecture i386
-    apt-get update
-    apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 gdb python python-pip libssl-dev gcc
-    pip install --upgrade pip
-    pip install pwntools
-    pip install ipython
-  SHELL
+```bash
+#!/bin/bash
+dpkg --add-architecture i386
+apt-get update
+apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 gdb python python-pip libssl-dev gcc git binutils
+pip install --upgrade pip
+pip install pwntools
+pip install ipython
+pip install ropper
+git clone https://github.com/longld/peda.git /home/ubuntu/peda
+echo "source ~/peda/peda.py" >> /home/ubuntu/.gdbinit
 ```
 
 [vagrantdl]: https://www.vagrantup.com/downloads.html

Diff for: lessons/3_intro_to_tools/2_interactive.c

@@ -0,0 +1,7 @@
+all: 1_sample 2_interactive
+
+1_sample:
+	gcc -o ./build/1_sample ./src/1_sample.c
+
+2_interactive:
+	gcc -o ./build/2_interactive ./src/2_interactive.c