diff options
| author | Thomas Penteker <tek@serverop.de> | 2010-09-04 19:25:02 +0200 |
|---|---|---|
| committer | Thomas Penteker <tek@serverop.de> | 2010-09-04 19:25:02 +0200 |
| commit | 0dfe9d3afa64845ba880f37b4d1420def9594bb6 (patch) | |
| tree | 7059be499041c1e811ad592b41874920410f9369 | |
| parent | eb3dab2600ac6fb8e956975cc732f83ad40c080b (diff) | |
| download | contrib-0dfe9d3afa64845ba880f37b4d1420def9594bb6.tar.gz contrib-0dfe9d3afa64845ba880f37b4d1420def9594bb6.tar.xz | |
nmap: fix building against openssl 1.0.0
| -rw-r--r-- | nmap/.md5sum | 1 | ||||
| -rw-r--r-- | nmap/Pkgfile | 4 | ||||
| -rw-r--r-- | nmap/nse_openssl.cc.diff | 35 |
3 files changed, 39 insertions, 1 deletions
diff --git a/nmap/.md5sum b/nmap/.md5sum index b7660b694..aa6bbb068 100644 --- a/nmap/.md5sum +++ b/nmap/.md5sum @@ -1 +1,2 @@ f77fa51d89ab27d35e5cd87bb086b858 nmap-5.21.tar.bz2 +bae7d1c65920d68a8c1f917a9cc93a1b nse_openssl.cc.diff diff --git a/nmap/Pkgfile b/nmap/Pkgfile index ae2bc2e86..a7cc09720 100644 --- a/nmap/Pkgfile +++ b/nmap/Pkgfile @@ -6,11 +6,13 @@ name=nmap version=5.21 release=1 -source=(http://ftp.uni-erlangen.de/mirrors/gentoo/distfiles/$name-$version.tar.bz2) +source=(http://ftp.uni-erlangen.de/mirrors/gentoo/distfiles/$name-$version.tar.bz2 \ + nse_openssl.cc.diff) build () { cd $name-$version + patch -i ../nse_openssl.cc.diff ./configure --prefix=/usr --libexecdir=/usr/lib --mandir=/usr/man \ --with-libpcre=included --with-liblua=included \ --with-libpcap=included --without-zenmap \ diff --git a/nmap/nse_openssl.cc.diff b/nmap/nse_openssl.cc.diff new file mode 100644 index 000000000..1695d2b32 --- /dev/null +++ b/nmap/nse_openssl.cc.diff @@ -0,0 +1,35 @@ +--- nse_openssl.cc.orig 2009-03-10 16:56:10.000000000 +1100 ++++ nse_openssl.cc 2010-07-09 07:36:47.000000000 +1000 +@@ -8,7 +8,6 @@ + #include <openssl/crypto.h> + #include <openssl/bn.h> + #include <openssl/rand.h> +-#include <openssl/md2.h> + #include <openssl/md4.h> + #include <openssl/md5.h> + #include <openssl/sha.h> +@@ -206,16 +205,6 @@ static int l_rand_pseudo_bytes( lua_Stat + return 1; + } + +-static int l_md2(lua_State *L) /** md2(string s) */ +-{ +- size_t len; +- const unsigned char *s = (unsigned char *) luaL_checklstring( L, 1, &len ); +- unsigned char digest[16]; +- +- lua_pushlstring( L, (char *) MD2( s, len, digest ), 16 ); +- return 1; +-} +- + static int l_md4(lua_State *L) /** md4(string s) */ + { + size_t len; +@@ -469,7 +458,6 @@ static const struct luaL_reg openssllib[ + { "bignum_mod_exp", l_bignum_mod_exp }, + { "rand_bytes", l_rand_bytes }, + { "rand_pseudo_bytes", l_rand_pseudo_bytes }, +- { "md2", l_md2 }, + { "md4", l_md4 }, + { "md5", l_md5 }, + { "sha1", l_sha1 }, |