Merge e9c9f85 into 4ddb702

CHANGELOG.md

@@ -70,11 +70,15 @@ The table below shows which release corresponds to each branch, and what date th
 - [#2092][2092] shellcraft: dup() is now called dupio() consistently across all supported arches
 - [#2093][2093] setresuid() in shellcraft uses current euid by default
 - [#2125][2125] Allow tube.recvregex to return capture groups
+- [#2082][2082] add libc flag to pwn template
+
 
 [2062]: https://github.com/Gallopsled/pwntools/pull/2062
 [2092]: https://github.com/Gallopsled/pwntools/pull/2092
 [2093]: https://github.com/Gallopsled/pwntools/pull/2093
 [2125]: https://github.com/Gallopsled/pwntools/pull/2125
+[2082]: https://github.com/Gallopsled/pwntools/pull/2082
+
 
 ## 4.9.0 (`beta`)
 

pwnlib/commandline/template.py

@@ -14,6 +14,7 @@
 )
 
 parser.add_argument('exe', nargs='?', help='Target binary')
+parser.add_argument('--libc', help='Target libc')
 parser.add_argument('--host', help='Remote host / SSH server')
 parser.add_argument('--port', help='Remote port / SSH port', type=int)
 parser.add_argument('--user', help='SSH Username')
@@ -49,6 +50,7 @@ def main(args):
 
     template = lookup.get_template('pwnup.mako')
     output = template.render(args.exe,
+                             args.libc,
                              args.host,
                              args.port,
                              args.user,

pwnlib/data/templates/pwnup.mako

@@ -1,4 +1,4 @@
-<%page args="binary, host=None, port=None, user=None, password=None, remote_path=None, quiet=False"/>\
+<%page args="binary, libc=None, host=None, port=None, user=None, password=None, remote_path=None, quiet=False"/>\
 <%
 import os
 import sys
@@ -51,6 +51,9 @@ context.update(arch='i386')
 exe = ${binary_repr}
 <% binary_repr = 'exe' %>
 %endif
+%if libc:
+libc = ELF('${libc}')
+%endif
 
 %if not quiet:
 # Many built-in settings can be controlled on the command-line and show up