Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

ncrack.spec Changed

@@ -17,18 +17,18 @@
 
 
 Name:           ncrack
-Version:        0.6.0+git.20180620
+Version:        0.7
 Release:        0
 Summary:        High-speed network authentication cracking tool
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Diagnostic
-URL:            https://nmap.org/ncrack/
-#Git-Clone:     https://github.com/nmap/ncrack.git
-#Source:         https://nmap.org/ncrack/dist/ncrack-0.6.tar.gz
-#Source1:        https://nmap.org/ncrack/dist/sigs/ncrack-0.6.tar.gz.asc
-Source:         %{name}-%{version}.tar.xz
+URL:            https://github.com/nmap/ncrack.git
+Source:         %name-%version.tar
 Patch0:         ncrack-fix-compile-errors.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  gcc-c++
+BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(libcrypto) >= 1.1
 BuildRequires:  pkgconfig(libssl) >= 1.1
@@ -58,10 +58,13 @@
 %autosetup -p1
 
 %build
+autoreconf -fvi
 export STRIP=$(type -P true)
+export 'CFLAGS=%optflags -Wno-deprecated-declarations --std=gnu99'
+export 'CXXFLAGS=%optflags -Wno-deprecated-declarations -std=gnu++14'
 %configure \
   --without-openssl-header-check
-make VERBOSE=1 %{?_smp_mflags}
+%make_build VERBOSE=1
 
 %install
 %make_install
@@ -69,8 +72,8 @@
 %files
 %license COPYING
 %doc CHANGELOG README.md
-%{_bindir}/ncrack
-%{_mandir}/man1/ncrack.1%{?ext_man}
-%{_datadir}/ncrack
+%_bindir/ncrack
+%_mandir/man1/ncrack.1%{?ext_man}
+%_datadir/ncrack
 
 %changelog

ncrack-fix-compile-errors.patch Changed

@@ -1,40 +1,417 @@
-diff --git a/opensshlib/deattack.c b/opensshlib/deattack.c
-index e76481a..2787e76 100644
---- a/opensshlib/deattack.c
-+++ b/opensshlib/deattack.c
-@@ -24,6 +24,8 @@
- #include <stdio.h>
- #include <stdlib.h>
+---
+ Makefile.in               |    1 -
+ modules/ncrack_psql.cc    |    4 ++--
+ modules/ncrack_webform.cc |    2 +-
+ modules/ncrack_winrm.cc   |   29 +++++++++++++++--------------
+ nbase/Makefile.in         |    2 --
+ ncrack_resume.cc          |    2 +-
+ nsock/src/Makefile.in     |    2 --
+ opensshlib/configure      |    2 +-
+ opensshlib/configure.ac   |   46 +++++++++++++++++++++++++++++++++++++++-------
+ opensshlib/xmalloc.c      |    1 +
+ 10 files changed, 60 insertions(+), 31 deletions(-)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -18,7 +18,6 @@ export OPENSSHLIB_DIR = @OPENSSHLIB_DIR@
+ 
+ DEFS = @DEFS@ -DNCRACK_NAME=\"$(NCRACK_NAME)\" -DNCRACK_URL=\"$(NCRACK_URL)\" \
+ -DNCRACK_PLATFORM=\"$(NCRACK_PLATFORM)\" -DNCRACKDATADIR=\"$(ncrackdatadir)\"
+-DEFS += -D_FORTIFY_SOURCE=2 
+ 
+ CC = @CC@
+ CXX = @CXX@
+--- a/modules/ncrack_psql.cc
++++ b/modules/ncrack_psql.cc
+@@ -165,7 +165,7 @@ static char *enhex(char *dest, const uns
+ 
+ /* Arguments are assumed to be non-NULL, with the exception of nc and
+    cnonce, which may be garbage only if qop == QOP_NONE. */
+-static void make_response(char bufMD5_DIGEST_LENGTH * 2 + 3,
++static void make_response(char bufMD5_DIGEST_LENGTH * 2 + 3 + 1,
+     const char *username, const char *password, const char *salt)
+ {
+     char HA1_hexMD5_DIGEST_LENGTH * 2 + 1;
+@@ -292,7 +292,7 @@ ncrack_psql(nsock_pool nsp, Connection *
+   memset(psql_code, 0, sizeof(psql_code));
+   memset(psql_salt, 0, sizeof(psql_salt));
+ 
+-  char response_hexMD5_DIGEST_LENGTH *2 + 3;
++  char response_hexMD5_DIGEST_LENGTH *2 + 3 + 1;
+   switch (con->state)
+   {
+     case PSQL_INIT:
+--- a/modules/ncrack_webform.cc
++++ b/modules/ncrack_webform.cc
+@@ -213,7 +213,7 @@ ncrack_webform(nsock_pool nsp, Connectio
+       /* Now append the form to the ougoing buffer */
+       con->outbuf->append("{\"email\":\"", 10);
+       con->outbuf->append(con->user, strlen(con->user));
+-      con->outbuf->append("\"\,\"password\":\"", 14);
++      con->outbuf->append("\",\"password\":\"", 14);
+       con->outbuf->append(con->pass, strlen(con->pass));
+       con->outbuf->append("\"}", 2);
+ 
+--- a/modules/ncrack_winrm.cc
++++ b/modules/ncrack_winrm.cc
+@@ -191,7 +191,7 @@ static void winrm_negotiate(nsock_pool n
+ static int winrm_loop_read(nsock_pool nsp, Connection *con);
+ static void winrm_free(Connection *con);
+ 
+-static void rand_str(char *dest, size_t length);
++static void rand_mem(char *dest, size_t length);
+ static void extend_key_56_to_64(const unsigned char *key_56, char *key);
+ static void setup_des_key(const unsigned char *key_56, DES_key_schedule *ks);
+ static uint64_t unix2nttime(time_t unix_time);
+@@ -281,9 +281,10 @@ ncrack_winrm(nsock_pool nsp, Connection
+       /* Send 5 random characters. The number of characters
+       * sent in this message is irrelevant. An empty request body is also valid.
+       */
+-      tmplen = 5 + 1;
++      tmplen = 5;
+       tmp = (char *)safe_malloc(tmplen + 1);
+-      rand_str(tmp, 5);
++      rand_mem(tmp, 5);
++      tmptmplen = '\0';
+     
+       con->outbuf->append(tmp, strlen(tmp));
+       free(tmp);
+@@ -471,7 +472,7 @@ winrm_negotiate(nsock_pool nsp, Connecti
+   char *b64;
+   char *start, *end;
+   char *challenge;
+-  char *type2;
++  char *type2, *type2_p;
+   char *target_info;
+   size_t i;
+   size_t domainlen;
+@@ -627,17 +628,16 @@ winrm_negotiate(nsock_pool nsp, Connecti
+         }
+         challenge = Strndup(start, i);
+         tmp = strtok (challenge,"\r\n");
+-        type2 = (char *)safe_malloc((strlen(tmp) + 1));
++        tmplen = strlen(tmp);
++        type2_p = type2 = (char *)safe_malloc(tmplen + 1);
+ 
+         /*  Base64 decode the type2 message (challenge)
+         */
+-        tmplen = strlen(tmp);
+-        base64_decode(tmp, tmplen, type2);
+-
+-        if (!type2) {
++        i = base64_decode(tmp, tmplen, type2);
++        if (!i) {
+           /* Type2 message decoding failed.
+           */
+-          free(type2);
++          free(type2_p);
+           serv->end.orly = true;
+           tmpsize = sizeof("Invalid type2 message.\n");
+           serv->end.reason = (char *)safe_malloc(tmpsize);
+@@ -646,6 +646,7 @@ winrm_negotiate(nsock_pool nsp, Connecti
+           return ncrack_module_end(nsp, con);
+         }
  
-+#include <malloc.h>
-+
- #include "deattack.h"
- #include "crc32.h"
- #include "sshbuf.h"
-diff --git a/opensshlib/sshkey.c b/opensshlib/sshkey.c
-index ef755d0..17e6f98 100644
---- a/opensshlib/sshkey.c
-+++ b/opensshlib/sshkey.c
-@@ -53,6 +53,9 @@
- #include <util.h>
- #endif /* HAVE_UTIL_H */
- 
-+#include <malloc.h>
-+
 +
- #include "ssh2.h"
- #include "ssherr.h"
- #include "misc.h"
-diff --git a/opensshlib/xmalloc.c b/opensshlib/xmalloc.c
-index c084400..ed82455 100644
---- a/opensshlib/xmalloc.c
-+++ b/opensshlib/xmalloc.c
-@@ -23,6 +23,8 @@
+         /* NTLM type-2 message structure:
+         *        Index  Description            Content
+         *          0    NTLMSSP Signature      Null-terminated ASCII "NTLMSSP"
+@@ -694,7 +695,7 @@ winrm_negotiate(nsock_pool nsp, Connecti
+           /* In this case, the type2 message flag is not present.
+           *  Exit gracefully.
+           */
+-          free(type2);
++          free(type2_p);
+           serv->end.orly = true;
+           tmpsize = sizeof("Invalid type2 message.\n");
+           serv->end.reason = (char *)safe_malloc(tmpsize);
+@@ -765,6 +766,7 @@ winrm_negotiate(nsock_pool nsp, Connecti
+         for (i = 0; i < 3; i++) {
+           type2++;
+         }
++        free(type2_p);
+ 
+         targetinfo_offset = (int) tmp_buf0;
+ 
+@@ -998,7 +1000,7 @@ winrm_negotiate(nsock_pool nsp, Connecti
+             /* Generate 8 random characters for NTLMv2 and LMv2
+             * hashes.
+             */
+-            rand_str(entropy, 8);
++            rand_mem(entropy, 8);
+ 
+             /* Calculate NTLM hash as we did before for v1.
+             * After calculating the NTLM hash we concatenate
+@@ -1369,7 +1371,7 @@ winrm_free(Connection *con)
+ 
+ 
+ static void 
+-rand_str(char *dest, size_t length) 
++rand_mem(char *dest, size_t length)
+ {
+     char charset = "0123456789"
+                      "abcdefghijklmnopqrstuvwxyz"
+@@ -1379,7 +1381,6 @@ rand_str(char *dest, size_t length)
+         size_t index = (double) rand() / RAND_MAX * (sizeof charset - 1);
+         *dest++ = charsetindex;
+     }
+-    *dest = '\0';
+ }
+ 
+ /*
+--- a/nbase/Makefile.in
++++ b/nbase/Makefile.in
+@@ -11,8 +11,6 @@ AR = ar
+ RANLIB = @RANLIB@
+ CCOPT = 
+ DEFS = @DEFS@
+-# With GCC, add extra security checks to source code.
+-DEFS += -D_FORTIFY_SOURCE=2

_service Changed

@@ -1,15 +1,18 @@
 <services>
-  <service mode="disabled" name="tar_scm">
-    <param name="url">https://github.com/nmap/ncrack.git</param>
-    <param name="scm">git</param>
-    <param name="changesgenerate">enable</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="versionformat">@PARENT_TAG@+git.%cd</param>
-  </service>
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service mode="disabled" name="set_version"/>
+	<service name="obs_scm">
+		<param name="filename">ncrack</param>
+		<param name="revision">7fab46addcb99326cbf60f41dbde22a1e87aebad</param>
+		<param name="scm">git</param>
+		<param name="submodules">disable</param>
+		<param name="url">https://github.com/nmap/ncrack.git</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="versionrewrite-pattern">v?(^-_\++)(.*)</param>
+		<param name="versionrewrite-replacement">\1</param>
+	</service>
+	<service mode="buildtime" name="tar">
+		<param name="obsinfo">ncrack.obsinfo</param>
+	</service>
+	<service mode="buildtime" name="set_version">
+		<param name="basename">ncrack</param>
+	</service>
 </services>
-

_service:obs_scm:ncrack-0.7.obscpio Added

_service:obs_scm:ncrack.obsinfo Added

_servicedata Deleted

ncrack-0.6.0+git.20180620.tar.xz Deleted