<86>Sep 3 09:19:45 userdel[1771655]: delete user 'rooter'
<86>Sep 3 09:19:45 userdel[1771655]: removed group 'rooter' owned by 'rooter'
<86>Sep 3 09:19:45 userdel[1771655]: removed shadow group 'rooter' owned by 'rooter'
<86>Sep 3 09:19:45 groupadd[1771697]: group added to /etc/group: name=rooter, GID=1805
<86>Sep 3 09:19:45 groupadd[1771697]: group added to /etc/gshadow: name=rooter
<86>Sep 3 09:19:45 groupadd[1771697]: new group: name=rooter, GID=1805
<86>Sep 3 09:19:45 useradd[1771716]: new user: name=rooter, UID=1805, GID=1805, home=/root, shell=/bin/bash
<86>Sep 3 09:19:45 userdel[1771750]: delete user 'builder'
<86>Sep 3 09:19:45 userdel[1771750]: removed group 'builder' owned by 'builder'
<86>Sep 3 09:19:45 userdel[1771750]: removed shadow group 'builder' owned by 'builder'
<86>Sep 3 09:19:45 groupadd[1771774]: group added to /etc/group: name=builder, GID=1806
<86>Sep 3 09:19:45 groupadd[1771774]: group added to /etc/gshadow: name=builder
<86>Sep 3 09:19:45 groupadd[1771774]: new group: name=builder, GID=1806
<86>Sep 3 09:19:45 useradd[1771796]: new user: name=builder, UID=1806, GID=1806, home=/usr/src, shell=/bin/bash
<13>Sep 3 09:19:48 rpmi: libgdbm-1.8.3-alt10 1454943313 installed
<13>Sep 3 09:19:48 rpmi: libexpat-2.4.3-alt1 p9+293696.100.1.1 1643124786 installed
<13>Sep 3 09:19:48 rpmi: libp11-kit-0.23.15-alt2 p9+254920.2400.19.1 1601385869 installed
<13>Sep 3 09:19:48 rpmi: libtasn1-4.14-alt1 p9+235792.100.2.1 1565425233 installed
<13>Sep 3 09:19:48 rpmi: rpm-macros-alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed
<13>Sep 3 09:19:48 rpmi: alternatives-0.5.1-alt1 sisyphus+226946.100.1.1 1554830426 installed
<13>Sep 3 09:19:48 rpmi: ca-certificates-2021.10.06-alt1 p9+289862.100.1.1 1637033643 installed
<13>Sep 3 09:19:48 rpmi: ca-trust-0.1.2-alt1 p9+233349.100.1.1 1561655062 installed
<13>Sep 3 09:19:48 rpmi: p11-kit-trust-0.23.15-alt2 p9+254920.2400.19.1 1601385869 installed
<13>Sep 3 09:19:48 rpmi: libcrypto1.1-1.1.1u-alt1 p9+322202.100.1.1 1685863283 installed
<13>Sep 3 09:19:48 rpmi: libssl1.1-1.1.1u-alt1 p9+322202.100.1.1 1685863283 installed
<13>Sep 3 09:19:48 rpmi: python3-3.7.11-alt1 p9+273501.10.37.1 1629720188 installed
<13>Sep 3 09:19:48 rpmi: libpython3-3.7.11-alt1 p9+273501.10.37.1 1629720188 installed
<13>Sep 3 09:19:49 rpmi: python3-base-3.7.11-alt1 p9+273501.10.37.1 1629720188 installed
<13>Sep 3 09:19:49 rpmi: tests-for-installed-python3-pkgs-0.1.13.1-alt2 1535450458 installed
<13>Sep 3 09:19:49 rpmi: rpm-build-python3-0.1.13.1-alt2 1535450458 installed
<13>Sep 3 09:19:51 rpmi: python3-module-pkg_resources-1:40.8.0-alt2 sisyphus+229158.200.2.1 1557735221 installed
<13>Sep 3 09:19:51 rpmi: python-modules-curses-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: libtinfo-devel-6.1.20180407-alt2 sisyphus+222164.200.1.1 1550686221 installed
<13>Sep 3 09:19:51 rpmi: libncurses-devel-6.1.20180407-alt2 sisyphus+222164.200.1.1 1550686221 installed
<13>Sep 3 09:19:51 rpmi: python3-dev-3.7.11-alt1 p9+273501.10.37.1 1629720188 installed
<13>Sep 3 09:19:51 rpmi: libverto-0.3.0-alt1_7 sisyphus+225932.100.1.1 1553994917 installed
<13>Sep 3 09:19:51 rpmi: libkeyutils-1.6-alt2 sisyphus+226520.100.2.1 1554512088 installed
<13>Sep 3 09:19:51 rpmi: libcom_err-1.44.6-alt1 sisyphus+224154.100.1.1 1552091653 installed
<86>Sep 3 09:19:51 groupadd[1800472]: group added to /etc/group: name=_keytab, GID=499
<86>Sep 3 09:19:51 groupadd[1800472]: group added to /etc/gshadow: name=_keytab
<86>Sep 3 09:19:51 groupadd[1800472]: new group: name=_keytab, GID=499
<13>Sep 3 09:19:51 rpmi: libkrb5-1.17.2-alt5 p9+325691.100.1.1 1690460821 installed
<13>Sep 3 09:19:51 rpmi: libtirpc-1.0.3-alt1 1532008015 installed
<13>Sep 3 09:19:51 rpmi: libnsl2-1.1.0-alt1_1 1511548748 installed
<13>Sep 3 09:19:51 rpmi: python-modules-compiler-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-email-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-unittest-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-encodings-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-nis-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-ctypes-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-multiprocessing-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-logging-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-tools-2to3-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-xml-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-hotshot-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-bsddb-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-modules-distutils-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-module-pkg_resources-1:40.8.0-alt2 sisyphus+229158.200.2.1 1557735221 installed
<13>Sep 3 09:19:51 rpmi: libnsl2-devel-1.1.0-alt1_1 1511548748 installed
<13>Sep 3 09:19:51 rpmi: python-dev-2.7.16-alt1.M90P.2 p9+260393.40.3.1 1604003646 installed
<13>Sep 3 09:19:51 rpmi: python-module-setuptools-1:40.8.0-alt2 sisyphus+229158.200.2.1 1557735221 installed
<13>Sep 3 09:19:51 rpmi: python3-module-setuptools-1:40.8.0-alt2 sisyphus+229158.200.2.1 1557735221 installed
Building target platforms: x86_64
Building for target x86_64
Wrote: /usr/src/in/nosrpm/python-module-ntlm-1.1.0-alt1.2.nosrc.rpm (w1.gzdio)
Installing python-module-ntlm-1.1.0-alt1.2.src.rpm
Building target platforms: x86_64
Building for target x86_64
Executing(%prep): /bin/sh -e /usr/src/tmp/rpm-tmp.60230
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ rm -rf python-module-ntlm-1.1.0
+ echo 'Source #0 (python-module-ntlm-1.1.0.tar):'
Source #0 (python-module-ntlm-1.1.0.tar):
+ /bin/tar -xf /usr/src/RPM/SOURCES/python-module-ntlm-1.1.0.tar
+ cd python-module-ntlm-1.1.0
+ /bin/chmod -c -Rf u+rwX,go-w .
+ cp -fR . ../python3
+ exit 0
Executing(%build): /bin/sh -e /usr/src/tmp/rpm-tmp.60230
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd python-module-ntlm-1.1.0
+ CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export CFLAGS
+ CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export CXXFLAGS
+ FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export FFLAGS
+ /usr/bin/python2.7 setup.py build --debug
running build
running build_py
creating build
creating build/lib
creating build/lib/ntlm
copying ntlm/ntlm.py -> build/lib/ntlm
copying ntlm/des_data.py -> build/lib/ntlm
copying ntlm/des_c.py -> build/lib/ntlm
copying ntlm/des.py -> build/lib/ntlm
copying ntlm/__init__.py -> build/lib/ntlm
copying ntlm/U32.py -> build/lib/ntlm
copying ntlm/HTTPNtlmAuthHandler.py -> build/lib/ntlm
+ pushd ../python3
~/RPM/BUILD/python3 ~/RPM/BUILD/python-module-ntlm-1.1.0
+ find -type f -name '*.py' -exec 2to3 -w -n '{}' +
RefactoringTool: Skipping optional fixer: buffer
RefactoringTool: Skipping optional fixer: idioms
RefactoringTool: Skipping optional fixer: set_literal
RefactoringTool: Skipping optional fixer: ws_comma
RefactoringTool: No changes to ./setup.py
RefactoringTool: Refactored ./ntlm/ntlm.py
--- ./ntlm/ntlm.py (original)
+++ ./ntlm/ntlm.py (refactored)
@@ -14,7 +14,7 @@
import struct
import base64
import string
-import des
+from . import des
import hashlib
import hmac
import random
@@ -109,69 +109,69 @@
"""
def dump_NegotiateFlags(NegotiateFlags):
if NegotiateFlags & NTLM_NegotiateUnicode:
- print "NTLM_NegotiateUnicode set"
+ print("NTLM_NegotiateUnicode set")
if NegotiateFlags & NTLM_NegotiateOEM:
- print "NTLM_NegotiateOEM set"
+ print("NTLM_NegotiateOEM set")
if NegotiateFlags & NTLM_RequestTarget:
- print "NTLM_RequestTarget set"
+ print("NTLM_RequestTarget set")
if NegotiateFlags & NTLM_Unknown9:
- print "NTLM_Unknown9 set"
+ print("NTLM_Unknown9 set")
if NegotiateFlags & NTLM_NegotiateSign:
- print "NTLM_NegotiateSign set"
+ print("NTLM_NegotiateSign set")
if NegotiateFlags & NTLM_NegotiateSeal:
- print "NTLM_NegotiateSeal set"
+ print("NTLM_NegotiateSeal set")
if NegotiateFlags & NTLM_NegotiateDatagram:
- print "NTLM_NegotiateDatagram set"
+ print("NTLM_NegotiateDatagram set")
if NegotiateFlags & NTLM_NegotiateLanManagerKey:
- print "NTLM_NegotiateLanManagerKey set"
+ print("NTLM_NegotiateLanManagerKey set")
if NegotiateFlags & NTLM_Unknown8:
- print "NTLM_Unknown8 set"
+ print("NTLM_Unknown8 set")
if NegotiateFlags & NTLM_NegotiateNTLM:
- print "NTLM_NegotiateNTLM set"
+ print("NTLM_NegotiateNTLM set")
if NegotiateFlags & NTLM_NegotiateNTOnly:
- print "NTLM_NegotiateNTOnly set"
+ print("NTLM_NegotiateNTOnly set")
if NegotiateFlags & NTLM_Anonymous:
- print "NTLM_Anonymous set"
+ print("NTLM_Anonymous set")
if NegotiateFlags & NTLM_NegotiateOemDomainSupplied:
- print "NTLM_NegotiateOemDomainSupplied set"
+ print("NTLM_NegotiateOemDomainSupplied set")
if NegotiateFlags & NTLM_NegotiateOemWorkstationSupplied:
- print "NTLM_NegotiateOemWorkstationSupplied set"
+ print("NTLM_NegotiateOemWorkstationSupplied set")
if NegotiateFlags & NTLM_Unknown6:
- print "NTLM_Unknown6 set"
+ print("NTLM_Unknown6 set")
if NegotiateFlags & NTLM_NegotiateAlwaysSign:
- print "NTLM_NegotiateAlwaysSign set"
+ print("NTLM_NegotiateAlwaysSign set")
if NegotiateFlags & NTLM_TargetTypeDomain:
- print "NTLM_TargetTypeDomain set"
+ print("NTLM_TargetTypeDomain set")
if NegotiateFlags & NTLM_TargetTypeServer:
- print "NTLM_TargetTypeServer set"
+ print("NTLM_TargetTypeServer set")
if NegotiateFlags & NTLM_TargetTypeShare:
- print "NTLM_TargetTypeShare set"
+ print("NTLM_TargetTypeShare set")
if NegotiateFlags & NTLM_NegotiateExtendedSecurity:
- print "NTLM_NegotiateExtendedSecurity set"
+ print("NTLM_NegotiateExtendedSecurity set")
if NegotiateFlags & NTLM_NegotiateIdentify:
- print "NTLM_NegotiateIdentify set"
+ print("NTLM_NegotiateIdentify set")
if NegotiateFlags & NTLM_Unknown5:
- print "NTLM_Unknown5 set"
+ print("NTLM_Unknown5 set")
if NegotiateFlags & NTLM_RequestNonNTSessionKey:
- print "NTLM_RequestNonNTSessionKey set"
+ print("NTLM_RequestNonNTSessionKey set")
if NegotiateFlags & NTLM_NegotiateTargetInfo:
- print "NTLM_NegotiateTargeRefactoringTool: Refactored ./ntlm/des_data.py
tInfo set"
+ print("NTLM_NegotiateTargetInfo set")
if NegotiateFlags & NTLM_Unknown4:
- print "NTLM_Unknown4 set"
+ print("NTLM_Unknown4 set")
if NegotiateFlags & NTLM_NegotiateVersion:
- print "NTLM_NegotiateVersion set"
+ print("NTLM_NegotiateVersion set")
if NegotiateFlags & NTLM_Unknown3:
- print "NTLM_Unknown3 set"
+ print("NTLM_Unknown3 set")
if NegotiateFlags & NTLM_Unknown2:
- print "NTLM_Unknown2 set"
+ print("NTLM_Unknown2 set")
if NegotiateFlags & NTLM_Unknown1:
- print "NTLM_Unknown1 set"
+ print("NTLM_Unknown1 set")
if NegotiateFlags & NTLM_Negotiate128:
- print "NTLM_Negotiate128 set"
+ print("NTLM_Negotiate128 set")
if NegotiateFlags & NTLM_NegotiateKeyExchange:
- print "NTLM_NegotiateKeyExchange set"
+ print("NTLM_NegotiateKeyExchange set")
if NegotiateFlags & NTLM_Negotiate56:
- print "NTLM_Negotiate56 set"
+ print("NTLM_Negotiate56 set")
def create_NTLM_NEGOTIATE_MESSAGE(user, type1_flags=NTLM_TYPE1_FLAGS):
BODY_LENGTH = 40
--- ./ntlm/des_data.py (original)
+++ ./ntlm/des_data.py (refactored)
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library. If not, see <http://www.gnu.org/licenses/> or <http://www.gnu.org/licenses/lgpl.txt>.
-from U32 import U32
+from .U32 import U32
# static unsigned long des_SPtrans[8][64]={
@@ -22,162 +22,162 @@
[
#nibble 0
[
-U32(0x00820200L), U32(0x00020000L), U32(0x80800000L), U32(0x80820200L),
-U32(0x00800000L), U32(0x80020200L), U32(0x80020000L), U32(0x80800000L),
-U32(0x80020200L), U32(0x00820200L), U32(0x00820000L), U32(0x80000200L),
-U32(0x80800200L), U32(0x00800000L), U32(0x00000000L), U32(0x80020000L),
-U32(0x00020000L), U32(0x80000000L), U32(0x00800200L), U32(0x00020200L),
-U32(0x80820200L), U32(0x00820000L), U32(0x80000200L), U32(0x00800200L),
-U32(0x80000000L), U32(0x00000200L), U32(0x00020200L), U32(0x80820000L),
-U32(0x00000200L), U32(0x80800200L), U32(0x80820000L), U32(0x00000000L),
-U32(0x00000000L), U32(0x80820200L), U32(0x00800200L), U32(0x80020000L),
-U32(0x00820200L), U32(0x00020000L), U32(0x80000200L), U32(0x00800200L),
-U32(0x80820000L), U32(0x00000200L), U32(0x00020200L), U32(0x80800000L),
-U32(0x80020200L), U32(0x80000000L), U32(0x80800000L), U32(0x00820000L),
-U32(0x80820200L), U32(0x00020200L), U32(0x00820000L), U32(0x80800200L),
-U32(0x00800000L), U32(0x80000200L), U32(0x80020000L), U32(0x00000000L),
-U32(0x00020000L), U32(0x00800000L), U32(0x80800200L), U32(0x00820200L),
-U32(0x80000000L), U32(0x80820000L), U32(0x00000200L), U32(0x80020200L),
+U32(0x00820200), U32(0x00020000), U32(0x80800000), U32(0x80820200),
+U32(0x00800000), U32(0x80020200), U32(0x80020000), U32(0x80800000),
+U32(0x80020200), U32(0x00820200), U32(0x00820000), U32(0x80000200),
+U32(0x80800200), U32(0x00800000), U32(0x00000000), U32(0x80020000),
+U32(0x00020000), U32(0x80000000), U32(0x00800200), U32(0x00020200),
+U32(0x80820200), U32(0x00820000), U32(0x80000200), U32(0x00800200),
+U32(0x80000000), U32(0x00000200), U32(0x00020200), U32(0x80820000),
+U32(0x00000200), U32(0x80800200), U32(0x80820000), U32(0x00000000),
+U32(0x00000000), U32(0x80820200), U32(0x00800200), U32(0x80020000),
+U32(0x00820200), U32(0x00020000), U32(0x80000200), U32(0x00800200),
+U32(0x80820000), U32(0x00000200), U32(0x00020200), U32(0x80800000),
+U32(0x80020200), U32(0x80000000), U32(0x80800000), U32(0x00820000),
+U32(0x80820200), U32(0x00020200), U32(0x00820000), U32(0x80800200),
+U32(0x00800000), U32(0x80000200), U32(0x80020000), U32(0x00000000),
+U32(0x00020000), U32(0x00800000), U32(0x80800200), U32(0x00820200),
+U32(0x80000000), U32(0x80820000), U32(0x00000200), U32(0x80020200),
],
#nibble 1
[
-U32(0x10042004L), U32(0x00000000L), U32(0x00042000L), U32(0x10040000L),
-U32(0x10000004L), U32(0x00002004L), U32(0x10002000L), U32(0x00042000L),
-U32(0x00002000L), U32(0x10040004L), U32(0x00000004L), U32(0x10002000L),
-U32(0x00040004L), U32(0x10042000L), U32(0x10040000L), U32(0x00000004L),
-U32(0x00040000L), U32(0x10002004L), U32(0x10040004L), U32(0x00002000L),
-U32(0x00042004L), U32(0x10000000L), U32(0x00000000L), U32(0x00040004L),
-U32(0x10002004L), U32(0x00042004L), U32(0x10042000L), U32(0x10000004L),
-U32(0x10000000L), U32(0x00040000L), U32(0x00002004L), U32(0x10042004L),
-U32(0x00040004L), U32(0x10042000L), U32(0x10002000L), U32(0x00042004L),
-U32(0x10042004L), U32(0x00040004L), U32(0x10000004L), U32(0x00000000L),
-U32(0x10000000L), U32(0x00002004L), U32(0x00040000L), U32(0x10040004L),
-U32(0x00002000L), U32(0x10000000L), U32(0x00042004L), U32(0x10002004L),
-U32(0x10042000L), U32(0x00002000L), U32(0x00000000L), U32(0x10000004L),
-U32(0x00000004L), U32(0x10042004L), U32(0x00042000L), U32(0x10040000L),
-U32(0x10040004L), U32(0x00040000L), U32(0x00002004L), U32(0x10002000L),
-U32(0x10002004L), U32(0x00000004L), U32(0x10040000L), U32(0x00042000L),
+U32(0x10042004), U32(0x00000000), U32(0x00042000), U32(0x10040000),
+U32(0x10000004), U32(0x00002004), U32(0x10002000), U32(0x00042000),
+U32(0x00002000), U32(0x10040004), U32(0x00000004), U32(0x10002000),
+U32(0x00040004), U32(0x10042000), U32(0x10040000), U32(0x00000004),
+U32(0x00040000), U32(0x10002004), U32(0x10040004), U32(0x00002000),
+U32(0x00042004), U32(0x10000000), U32(0x00000000), U32(0x00040004),
+U32(0x10002004), U32(0x00042004), U32(0x10042000), U32(0x10000004),
+U32(0x10000000), U32(0x00040000), U32(0x00002004), U32(0x10042004),
+U32(0x00040004), U32(0x10042000), U32(0x10002000), U32(0x00042004),
+U32(0x10042004), U32(0x00040004), U32(0x10000004), U32(0x00000000),
+U32(0x10000000), U32(0x00002004), U32(0x00040000), U32(0x10040004),
+U32(0x00002000), U32(0x10000000), U32(0x00042004), U32(0x10002004),
+U32(0x10042000), U32(0x00002000), U32(0x00000000), U32(0x10000004),
+U32(0x00000004), U32(0x10042004), U32(0x00042000), U32(0x10040000),
+U32(0x10040004), U32(0x00040000), U32(0x00002004), U32(0x10002000),
+U32(0x10002004), U32(0x00000004), U32(0x10040000), U32(0x00042000),
],
#nibble 2
[
-U32(0x41000000L), U32(0x01010040L), U32(0x00000040L), U32(0x41000040L),
-U32(0x40010000L), U32(0x01000000L), U32(0x41000040L), U32(0x00010040L),
-U32(0x01000040L), U32(0x00010000L), U32(0x01010000L), U32(0x40000000L),
-U32(0x41010040L), U32(0x40000040L), U32(0x40000000L), U32(0x41010000L),
-U32(0x00000000L), U32(0x40010000L), U32(0x01010040L), U32(0x00000040L),
-U32(0x40000040L), U32(0x41010040L), U32(0x00010000L), U32(0x41000000L),
-U32(0x41010000L), U32(0x01000040L), U32(0x40010040L), U32(0x01010000L),
-U32(0x00010040L), U32(0x00000000L), U32(0x01000000L), U32(0x40010040L),
-U32(0x01010040L), U32(0x00000040L), U32(0x40000000L), U32(0x00010000L),
-U32(0x40000040L), U32(0x40010000L), U32(0x01010000L), U32(0x41000040L),
-U32(0x00000000L), U32(0x01010040L), U32(0x00010040L), U32(0x41010000L),
-U32(0x40010000L), U32(0x01000000L), U32(0x41010040L), U32(0x40000000L),
-U32(0x40010040L), U32(0x41000000L), U32(0x01000000L), U32(0x41010040L),
-U32(0x00010000L), U32(0x01000040L), U32(0x41000040L), U32(0x00010040L),
-U32(0x01000040L), U32(0x00000000L), U32(0x41010000L), U32(0x40000040L),
-U32(0x41000000L), U32(0x40010040L), U32(0x00000040L), U32(0x01010000L),
+U32(0x41000000), U32(0x01010040), U32(0x00000040), U32(0x41000040),
+U32(0x40010000), U32(0x01000000), U32(0x41000040), U32(0x00010040),
+U32(0x01000040), U32(0x00010000), U32(0x01010000), U32(0x40000000),
+U32(0x41010040), U32(0x40000040), U32(0x40000000), U32(0x41010000),
+U32(0x00000000), U32(0x40010000), U32(0x01010040), U32(0x00000040),
+U32(0x40000040), U32(0x41010040), U32(0x00010000), U32(0x41000000),
+U32(0x41010000), U32(0x01000040), U32(0x40010040), U32(0x01010000),
+U32(0x00010040), U32(0x00000000), U32(0x01000000), U32(0x40010040),
+U32(0x01010040), U32(0x00000040), U32(0x40000000), U32(0x00010000),
+U32(0x40000040), U32(0x40010000), U32(0x01010000), U32(0x41000040),
+U32(0x00000000), U32(0x01010040), U32(0x00010040), U32(0x41010000),
+U32(0x40010000), U32(0x01000000), U32(0x41010040), U32(0x40000000),
+U32(0x40010040), U32(0x41000000), U32(0x01000000), U32(0x41010040),
+U32(0x00010000), U32(0x01000040), U32(0x41000040), U32(0x00010040),
+U32(0x01000040), U32(0x00000000), U32(0x41010000), U32(0x40000040),
+U32(0x41000000), U32(0x40010040), U32(0x00000040), U32(0x01010000),
],
#nibble 3
[
-U32(0x00100402L), U32(0x04000400L), U32(0x00000002L), U32(0x04100402L),
-U32(0x00000000L), U32(0x04100000L), U32(0x04000402L), U32(0x00100002L),
-U32(0x04100400L), U32(0x04000002L), U32(0x04000000L), U32(0x00000402L),
-U32(0x04000002L), U32(0x00100402L), U32(0x00100000L), U32(0x04000000L),
-U32(0x04100002L), U32(0x00100400L), U32(0x00000400L), U32(0x00000002L),
-U32(0x00100400L), U32(0x04000402L), U32(0x04100000L), U32(0x00000400L),
-U32(0x00000402L), U32(0x00000000L), U32(0x00100002L), U32(0x04100400L),
-U32(0x04000400L), U32(0x04100002L), U32(0x04100402L), U32(0x00100000L),
-U32(0x04100002L), U32(0x00000402L), U32(0x00100000L), U32(0x04000002L),
-U32(0x00100400L), U32(0x04000400L), U32(0x00000002L), U32(0x04100000L),
-U32(0x04000402L), U32(0x00000000L), U32(0x00000400L), U32(0x00100002L),
-U32(0x00000000L), U32(0x04100002L), U32(0x04100400L), U32(0x00000400L),
-U32(0x04000000L), U32(0x04100402L), U32(0x00100402L), U32(0x00100000L),
-U32(0x04100402L), U32(0x00000002L), U32(0x04000400L), U32(0x00100402L),
-U32(0x00100002L), U32(0x00100400L), U32(0x04100000L), U32(0x04000402L),
-U32(0x00000402L), U32(0x04000000L), U32(0x04000002L), U32(0x04100400L),
+U32(0x00100402), U32(0x04000400), U32(0x00000002), U32(0x04100402),
+U32(0x00000000), U32(0x04100000), U32(0x04000402), U32(0x00100002),
+U32(0x04100400), U32(0x04000002), U32(0x04000000), U32(0x00000402),
+U32(0x04000002), U32(0x00100402), U32(0x00100000), U32(0x04000000),
+U32(0x04100002), U32(0x00100400), U32(0x00000400), U32(0x00000002),
+U32(0x00100400), U32(0x04000402), U32(0x04100000), U32(0x00000400),
+U32(0x00000402), U32(0x00000000), U32(0x00100002), U32(0x04100400),
+U32(0x04000400), U32(0x04100002), U32(0x04100402), U32(0x00100000),
+U32(0x04100002), U32(0x00000402), U32(0x00100000), U32(0x04000002),
+U32(0x00100400), U32(0x04000400), U32(0x00000002), U32(0x04100000),
+U32(0x04000402), U32(0x00000000), U32(0x00000400), U32(0x00100002),
+U32(0x00000000), U32(0x04100002), U32(0x04100400), U32(0x00000400),
+U32(0x04000000), U32(0x04100402), U32(0x00100402), U32(0x00100000),
+U32(0x04100402), U32(0x00000002), U32(0x04000400), U32(0x00100402),
+U32(0x00100002), U32(0x00100400), U32(0x04100000), U32(0x04000402),
+U32(0x00000402), U32(0x04000000), U32(0x04000002), U32(0x04100400),
],
#nibble 4
[
-U32(0x02000000L), U32(0x00004000L), U32(0x00000100L), U32(0x02004108L),
-U32(0x02004008L), U32(0x02000100L), U32(0x00004108L), U32(0x02004000L),
-U32(0x00004000L), U32(0x00000008L), U32(0x02000008L), U32(0x00004100L),
-U32(0x02000108L), U32(0x02004008L), U32(0x02004100L), U32(0x00000000L),
-U32(0x00004100L), U32(0x02000000L), U32(0x00004008L), U32(0x00000108L),
-U32(0x02000100L), U32(0x00004108L), U32(0x00000000L), U32(0x02000008L),
-U32(0x00000008L), U32(0x02000108L), U32(0x02004108L), U32(0x00004008L),
-U32(0x02004000L), U32(0x00000100L), U32(0x00000108L), U32(0x02004100L),
-U32(0x02004100L), U32(0x02000108L), U32(0x00004008L), U32(0x02004000L),
-U32(0x00004000L), U32(0x00000008L), U32(0x02000008L), U32(0x02000100L),
-U32(0x02000000L), U32(0x00004100L), U32(0x02004108L), U32(0x00000000L),
-U32(0x00004108L), U32(0x02000000L), U32(0x00000100L), U32(0x00004008L),
-U32(0x02000108L), U32(0x00000100L), U32(0x00000000L), U32(0x02004108L),
-U32(0x02004008L), U32(0x02004100L), U32(0x00000108L), U32(0x00004000L),
-U32(0x00004100L), U32(0x02004008L), U32(0x02000100L), U32(0x00000108L),
-U32(0x00000008L), U32(0x00004108L), U32(0x02004000L), U32(0x02000008L),
+U32(0x02000000), U32(0x00004000), U32(0x00000100), U32(0x02004108),
+U32(0x02004008), U32(0x02000100), U32(0x00004108), U32(0x02004000),
+U32(0x00004000), U32(0x00000008), U32(0x02000008), U32(0x00004100),
+U32(0x02000108), U32(0x02004008), U32(0x02004100), U32(0x00000000),
+U32(0x00004100), U32(0x02000000), U32(0x00004008), U32(0x00000108),
+U32(0x02000100), U32(0x00004108), U32(0x00000000), U32(0x02000008),
+U32(0x00000008), U32(0x02000108), U32(0x02004108), U32(0x00004008),
+U32(0x02004000), U32(0x00000100), U32(0x00000108), U32(0x02004100),
+U32(0x02004100), U32(0x02000108), U32(0x00004008), U32(0x02004000),
+U32(0x00004000), U32(0x00000008), U32(0x02000008), U32(0x02000100),
+U32(0x02000000), U32(0x00004100), U32(0x02004108), U32(0x00000000),
+U32(0x00004108), U32(0x02000000), U32(0x00000100), U32(0x00004008),
+U32(0x02000108), U32(0x00000100), U32(0x00000000), U32(0x02004108),
+U32(0x02004008), U32(0x02004100), U32(0x00000108), U32(0x00004000),
+U32(0x00004100), U32(0x02004008), U32(0x02000100), U32(0x00000108),
+U32(0x00000008), U32(0x00004108), U32(0x02004000), U32(0x02000008),
],
#nibble 5
[
-U32(0x20000010L), U32(0x00080010L), U32(0x00000000L), U32(0x20080800L),
-U32(0x00080010L), U32(0x00000800L), U32(0x20000810L), U32(0x00080000L),
-U32(0x00000810L), U32(0x20080810L), U32(0x00080800L), U32(0x20000000L),
-U32(0x20000800L), U32(0x20000010L), U32(0x20080000L), U32(0x00080810L),
-U32(0x00080000L), U32(0x20000810L), U32(0x20080010L), U32(0x00000000L),
-U32(0x00000800L), U32(0x00000010L), U32(0x20080800L), U32(0x20080010L),
-U32(0x20080810L), U32(0x20080000L), U32(0x20000000L), U32(0x00000810L),
-U32(0x00000010L), U32(0x00080800L), U32(0x00080810L), U32(0x20000800L),
-U32(0x00000810L), U32(0x20000000L), U32(0x20000800L), U32(0x00080810L),
-U32(0x20080800L), U32(0x00080010L), U32(0x00000000L), U32(0x20000800L),
-U32(0x20000000L), U32(0x00000800L), U32(0x20080010L), U32(0x00080000L),
-U32(0x00080010L), U32(0x20080810L), U32(0x00080800L), U32(0x00000010L),
-U32(0x20080810L), U32(0x00080800L), U32(0x00080000L), U32(0x20000810L),
-U32(0x20000010L), U32(0x20080000L), U32(0x00080810L), U32(0x00000000L),
-U32(0x00000800L), U32(0x20000010L), U32(0x20000810L), U32(0x20080800L),
-U32(0x20080000L), U32(0x00000810L), U32(0x00000010L), U32(0x20080010L),
+U32(0x20000010), U32(0x00080010), U32(0x00000000), U32(0x20080800),
+U32(0x00080010), U32(0x00000800), U32(0x20000810), U32(0x00080000),
+U32(0x00000810), U32(0x20080810), U32(0x00080800), U32(0x20000000),
+U32(0x20000800), U32(0x20000010), U32(0x20080000), U32(0x00080810),
+U32(0x00080000), U32(0x20000810), U32(0x20080010), U32(0x00000000),
+U32(0x00000800), U32(0x00000010), U32(0x20080800), U32(0x20080010),
+U32(0x20080810), U32(0x20080000), U32(0x20000000), U32(0x00000810),
+U32(0x00000010), U32(0x00080800), U32(0x00080810), U32(0x20000800),
+U32(0x00000810), U32(0x20000000), U32(0x20000800), U32(0x00080810),
+U32(0x20080800), U32(0x00080010), U32(0x00000000), U32(0x20000800),
+U32(0x20000000), U32(0x00000800), U32(0x20080010), U32(0x00080000),
+U32(0x00080010), U32(0x20080810), U32(0x00080800), U32(0x00000010),
+U32(0x20080810), U32(0x00080800), U32(0x00080000), U32(0x20000810),
+U32(0x20000010), U32(0x20080000), U32(0x00080810), U32(0x00000000),
+U32(0x00000800), U32(0x20000010), U32(0x20000810), U32(0x20080800),
+U32(0x20080000), U32(0x00000810), U32(0x00000010), U32(0x20080010),
],
#nibble 6
[
-U32(0x00001000L), U32(0x00000080L), U32(0x00400080L), U32(0x00400001L),
-U32(0x00401081L), U32(0x00001001L), U32(0x00001080L), U32(0x00000000L),
-U32(0x00400000L), U32(0x00400081L), U32(0x00000081L), U32(0x00401000L),
-U32(0x00000001L), U32(0x00401080L), U32(0x00401000L), U32(0x00000081L),
-U32(0x00400081L), U32(0x00001000L), U32(0x00001001L), U32(0x00401081L),
-U32(0x00000000L), U32(0x00400080L), U32(0x00400001L), U32(0x00001080L),
-U32(0x00401001L), U32(0x00001081L), U32(0x00401080L), U32(0x00000001L),
-U32(0x00001081L), U32(0x00401001L), U32(0x00000080L), U32(0x00400000L),
-U32(0x00001081L), U32(0x00401000L), U32(0x00401001L), U32(0x00000081L),
-U32(0x00001000L), U32(0x00000080L), U32(0x00400000L), U32(0x00401001L),
-U32(0x00400081L), U32(0x00001081L), U32(0x00001080L), U32(0x00000000L),
-U32(0x00000080L), U32(0x00400001L), U32(0x00000001L), U32(0x00400080L),
-U32(0x00000000L), U32(0x00400081L), U32(0x00400080L), U32(0x00001080L),
-U32(0x00000081L), U32(0x00001000L), U32(0x00401081L), U32(0x00400000L),
-U32(0x00401080L), U32(0x00000001L), U32(0x00001001L), U32(0x00401081L),
-U32(0x00400001L), U32(0x00401080L), U32(0x00401000L), U32(0x00001001L),
+U32(0x00001000), U32(0x00000080), U32(0x00400080), U32(0x00400001),
+U32(0x00401081), U32(0x00001001), U32(0x00001080), U32(0x00000000),
+U32(0x00400000), U32(0x00400081), U32(0x00000081), U32(0x00401000),
+U32(0x00000001), U32(0x00401080), U32(0x00401000), U32(0x00000081),
+U32(0x00400081), U32(0x00001000), U32(0x00001001), U32(0x00401081),
+U32(0x00000000), U32(0x00400080), U32(0x00400001), U32(0x00001080),
+U32(0x00401001), U32(0x00001081), U32(0x00401080), U32(0x00000001),
+U32(0x00001081), U32(0x00401001), U32(0x00000080), U32(0x00400000),
+U32(0x00001081), U32(0x00401000), U32(0x00401001), U32(0x00000081),
+U32(0x00001000), U32(0x00000080), U32(0x00400000), U32(0x00401001),
+U32(0x00400081), U32(0x00001081), U32(0x00001080), U32(0x00000000),
+U32(0x00000080), U32(0x00400001), U32(0x00000001), U32(0x00400080),
+U32(0x00000000), U32(0x00400081), U32(0x00400080), U32(0x00001080),
+U32(0x00000081), U32(0x00001000), U32(0x00401081), U32(0x00400000),
+U32(0x00401080), U32(0x00000001), U32(0x00001001), U32(0x00401081),
+U32(0x00400001), U32(0x00401080), U32(0x00401000), U32(0x00001001),
],
#nibble 7
[
-U32(0x08200020L), U32(0x08208000L), U32(0x00008020L), U32(0x00000000L),
-U32(0x08008000L), U32(0x00200020L), U32(0x08200000L), U32(0x08208020L),
-U32(0x00000020L), U32(0x08000000L), U32(0x00208000L), U32(0x00008020L),
-U32(0x00208020L), U32(0x08008020L), U32(0x08000020L), U32(0x08200000L),
-U32(0x00008000L), U32(0x00208020L), U32(0x00200020L), U32(0x08008000L),
-U32(0x08208020L), U32(0x08000020L), U32(0x00000000L), U32(0x00208000L),
-U32(0x08000000L), U32(0x00200000L), U32(0x08008020L), U32(0x08200020L),
-U32(0x00200000L), U32(0x00008000L), U32(0x08208000L), U32(0x00000020L),
-U32(0x00200000L), U32(0x00008000L), U32(0x08000020L), U32(0x08208020L),
-U32(0x00008020L), U32(0x08000000L), U32(0x00000000L), U32(0x00208000L),
-U32(0x08200020L), U32(0x08008020L), U32(0x08008000L), U32(0x00200020L),
-U32(0x08208000L), U32(0x00000020L), U32(0x00200020L), U32(0x08008000L),
-U32(0x08208020L), U32(0x00200000L), U32(0x08200000L), U32(0x08000020L),
-U32(0x00208000L), U32(0x00008020L), U32(0x08008020L), U32(0x08200000L),
-U32(0x00000020L), U32(0x08208000L), U32(0x00208020L), U32(0x00000000L),
-U32(0x08000000L), U32(0x08200020L), U32(0x00008000L), U32(0x00208020L),
+U32(0x08200020), U32(0x08208000), U32(0x00008020), U32(0x00000000),
+U32(0x08008000), U32(0x00200020), U32(0x08200000), U32(0x08208020),
+U32(0x00000020), U32(0x08000000), U32(0x00208000), U32(0x00008020),
+U32(0x00208020), U32(0x08008020), U32(0x08000020), U32(0x08200000),
+U32(0x00008000), U32(0x00208020), U32(0x00200020), U32(0x08008000),
+U32(0x08208020), U32(0x08000020), U32(0x00000000), U32(0x00208000),
+U32(0x08000000), U32(0x00200000), U32(0x08008020), U32(0x08200020),
+U32(0x00200000), U32(0x00008000), U32(0x08208000), U32(0x00000020),
+U32(0x00200000), U32(0x00008000), U32(0x08000020), U32(0x08208020),
+U32(0x00008020), U32(0x08000000), U32(0x00000000), U32(0x00208000),
+U32(0x08200020), U32(0x08008020), U32(0x08008000), U32(0x00200020),
+U32(0x08208000), U32(0x00000020), U32(0x00200020), U32(0x08008000),
+U32(0x08208020), U32(0x00200000), U32(0x08200000), U32(0x08000020),
+U32(0x00208000), U32(0x00008020), U32(0x08008020), U32(0x08200000),
+U32(0x00000020), U32(0x08208000), U32(0x00208020), U32(0x00000000),
+U32(0x08000000), U32(0x08200020), U32(0x00008000), U32(0x00208020),
],
]
@@ -187,162 +187,162 @@
[
#for C bits (numbered as per FIPS 46) 1 2 3 4 5 6
[
-U32(0x00000000L),U32(0x00000010L),U32(0x20000000L),U32(0x20000010L),
-U32(0x00010000L),U32(0x00010010L),U32(0x20010000L),U32(0x20010010L),
-U32(0x00000800L),U32(0x00000810L),U32(0x20000800L),U32(0x20000810L),
-U32(0x00010800L),U32(0x00010810L),U32(0x20010800L),U32(0x20010810L),
-U32(0x00000020L),U32(0x00000030L),U32(0x20000020L),U32(0x20000030L),
-U32(0x00010020L),U32(0x00010030L),U32(0x20010020L),U32(0x20010030L),
-U32(0x00000820L),U32(0x00000830L),U32(0x20000820L),U32(0x20000830L),
-U32(0x00010820L),U32(0x00010830L),U32(0x20010820L),U32(0x20010830L),
-U32(0x00080000L),U32(0x00080010L),U32(0x20080000L),U32(0x20080010L),
-U32(0x00090000L),U32(0x00090010L),U32(0x20090000L),U32(0x20090010L),
-U32(0x00080800L),U32(0x00080810L),U32(0x20080800L),U32(0x20080810L),
-U32(0x00090800L),U32(0x00090810L),U32(0x20090800L),U32(0x20090810L),
-U32(0x00080020L),U32(0x00080030L),U32(0x20080020L),U32(0x20080030L),
-U32(0x00090020L),U32(0x00090030L),U32(0x20090020L),U32(0x20090030L),
-U32(0x00080820L),U32(0x00080830L),U32(0x20080820L),U32(0x20080830L),
-U32(0x00090820L),U32(0x00090830L),U32(0x20090820L),U32(0x20090830L),
+U32(0x00000000),U32(0x00000010),U32(0x20000000),U32(0x20000010),
+U32(0x00010000),U32(0x00010010),U32(0x20010000),U32(0x20010010),
+U32(0x00000800),U32(0x00000810),U32(0x20000800),U32(0x20000810),
+U32(0x00010800),U32(0x00010810),U32(0x20010800),U32(0x20010810),
+U32(0x00000020),U32(0x00000030),U32(0x20000020),U32(0x20000030),
+U32(0x00010020),U32(0x00010030),U32(0x20010020),U32(0x20010030),
+U32(0x00000820),U32(0x00000830),U32(0x20000820),U32(0x20000830),
+U32(0x00010820),U32(0x00010830),U32(0x20010820),U32(0x20010830),
+U32(0x00080000),U32(0x00080010),U32(0x20080000),U32(0x20080010),
+U32(0x00090000),U32(0x00090010),U32(0x20090000),U32(0x20090010),
+U32(0x00080800),U32(0x00080810),U32(0x20080800),U32(0x20080810),
+U32(0x00090800),U32(0x00090810),U32(0x20090800),U32(0x20090810),
+U32(0x00080020),U32(0x00080030),U32(0x20080020),U32(0x20080030),
+U32(0x00090020),U32(0x00090030),U32(0x20090020),U32(0x20090030),
+U32(0x00080820),U32(0x00080830),U32(0x20080820),U32(0x20080830),
+U32(0x00090820),U32(0x00090830),U32(0x20090820),U32(0x20090830),
],
#for C bits (numbered as per FIPS 46) 7 8 10 11 12 13
[
-U32(0x00000000L),U32(0x02000000L),U32(0x00002000L),U32(0x02002000L),
-U32(0x00200000L),U32(0x02200000L),U32(0x00202000L),U32(0x02202000L),
-U32(0x00000004L),U32(0x02000004L),U32(0x00002004L),U32(0x02002004L),
-U32(0x00200004L),U32(0x02200004L),U32(0x00202004L),U32(0x02202004L),
-U32(0x00000400L),U32(0x02000400L),U32(0x00002400L),U32(0x02002400L),
-U32(0x00200400L),U32(0x02200400L),U32(0x00202400L),U32(0x02202400L),
-U32(0x00000404L),U32(0x02000404L),U32(0x00002404L),U32(0x02002404L),
-U32(0x00200404L),U32(0x02200404L),U32(0x00202404L),U32(0x02202404L),
-U32(0x10000000L),U32(0x12000000L),U32(0x10002000L),U32(0x12002000L),
-U32(0x10200000L),U32(0x12200000L),U32(0x10202000L),U32(0x12202000L),
-U32(0x10000004L),U32(0x12000004L),U32(0x10002004L),U32(0x12002004L),
-U32(0x10200004L),U32(0x12200004L),U32(0x10202004L),U32(0x12202004L),
-U32(0x10000400L),U32(0x12000400L),U32(0x10002400L),U32(0x12002400L),
-U32(0x10200400L),U32(0x12200400L),U32(0x10202400L),U32(0x12202400L),
-U32(0x10000404L),U32(0x12000404L),U32(0x10002404L),U32(0x12002404L),
-U32(0x10200404L),U32(0x12200404L),U32(0x10202404L),U32(0x12202404L),
+U32(0x00000000),U32(0x02000000),U32(0x00002000),U32(0x02002000),
+U32(0x00200000),U32(0x02200000),U32(0x00202000),U32(0x02202000),
+U32(0x00000004),U32(0x02000004),U32(0x00002004),U32(0x02002004),
+U32(0x00200004),U32(0x02200004),U32(0x00202004),U32(0x02202004),
+U32(0x00000400),U32(0x02000400),U32(0x00002400),U32(0x02002400),
+U32(0x00200400),U32(0x02200400),U32(0x00202400),U32(0x02202400),
+U32(0x00000404),U32(0x02000404),U32(0x00002404),U32(0x02002404),
+U32(0x00200404),U32(0x02200404),U32(0x00202404),U32(0x02202404),
+U32(0x10000000),U32(0x12000000),U32(0x10002000),U32(0x12002000),
+U32(0x10200000),U32(0x12200000),U32(0x10202000),U32(0x12202000),
+U32(0x10000004),U32(0x12000004),U32(0x10002004),U32(0x12002004),
+U32(0x10200004),U32(0x12200004),U32(0x10202004),U32(0x12202004),
+U32(0x10000400),U32(0x12000400),U32(0x10002400),U32(0x12002400),
+U32(0x10200400),U32(0x12200400),U32(0x10202400),U32(0x12202400),
+U32(0x10000404),U32(0x12000404),U32(0x10002404),U32(0x12002404),
+U32(0x10200404),U32(0x12200404),U32(0x10202404),U32(0x12202404),
],
#for C bits (numbered as per FIPS 46) 14 15 16 17 19 20
[
-U32(0x00000000L),U32(0x00000001L),U32(0x00040000L),U32(0x00040001L),
-U32(0x01000000L),U32(0x01000001L),U32(0x01040000L),U32(0x01040001L),
-U32(0x00000002L),U32(0x00000003L),U32(0x00040002L),U32(0x00040003L),
-U32(0x01000002L),U32(0x01000003L),U32(0x01040002L),U32(0x01040003L),
-U32(0x00000200L),U32(0x00000201L),U32(0x00040200L),U32(0x00040201L),
-U32(0x01000200L),U32(0x01000201L),U32(0x01040200L),U32(0x01040201L),
-U32(0x00000202L),U32(0x00000203L),U32(0x00040202L),U32(0x00040203L),
-U32(0x01000202L),U32(0x01000203L),U32(0x01040202L),U32(0x01040203L),
-U32(0x08000000L),U32(0x08000001L),U32(0x08040000L),U32(0x08040001L),
-U32(0x09000000L),U32(0x09000001L),U32(0x09040000L),U32(0x09040001L),
-U32(0x08000002L),U32(0x08000003L),U32(0x08040002L),U32(0x08040003L),
-U32(0x09000002L),U32(0x09000003L),U32(0x09040002L),U32(0x09040003L),
-U32(0x08000200L),U32(0x08000201L),U32(0x08040200L),U32(0x08040201L),
-U32(0x09000200L),U32(0x09000201L),U32(0x09040200L),U32(0x09040201L),
-U32(0x08000202L),U32(0x08000203L),U32(0x08040202L),U32(0x08040203L),
-U32(0x09000202L),U32(0x09000203L),U32(0x09040202L),U32(0x09040203L),
+U32(0x00000000),U32(0x00000001),U32(0x00040000),U32(0x00040001),
+U32(0x01000000),U32(0x01000001),U32(0x01040000),U32(0x01040001),
+U32(0x00000002),U32(0x00000003),U32(0x00040002),U32(0x00040003),
+U32(0x01000002),U32(0x01000003),U32(0x01040002),U32(0x01040003),
+U32(0x00000200),U32(0x00000201),U32(0x00040200),U32(0x00040201),
+U32(0x01000200),U32(0x01000201),U32(0x01040200),U32(0x01040201),
+U32(0x00000202),U32(0x00000203),U32(0x00040202),U32(0x00040203),
+U32(0x01000202),U32(0x01000203),U32(0x01040202),U32(0x01040203),
+U32(0x08000000),U32(0x08000001),U32(0x08040000),U32(0x08040001),
+U32(0x09000000),U32(0x09000001),U32(0x09040000),U32(0x09040001),
+U32(0x08000002),U32(0x08000003),U32(0x08040002),U32(0x08040003),
+U32(0x09000002),U32(0x09000003),U32(0x09040002),U32(0x09040003),
+U32(0x08000200),U32(0x08000201),U32(0x08040200),U32(0x08040201),
+U32(0x09000200),U32(0x09000201),U32(0x09040200),U32(0x09040201),
+U32(0x08000202),U32(0x08000203),U32(0x08040202),U32(0x08040203),
+U32(0x09000202),U32(0x09000203),U32(0x09040202),U32(0x09040203),
],
#for C bits (numbered as per FIPS 46) 21 23 24 26 27 28
[
-U32(0x00000000L),U32(0x00100000L),U32(0x00000100L),U32(0x00100100L),
-U32(0x00000008L),U32(0x00100008L),U32(0x00000108L),U32(0x00100108L),
-U32(0x00001000L),U32(0x00101000L),U32(0x00001100L),U32(0x00101100L),
-U32(0x00001008L),U32(0x00101008L),U32(0x00001108L),U32(0x00101108L),
-U32(0x04000000L),U32(0x04100000L),U32(0x04000100L),U32(0x04100100L),
-U32(0x04000008L),U32(0x04100008L),U32(0x04000108L),U32(0x04100108L),
-U32(0x04001000L),U32(0x04101000L),U32(0x04001100L),U32(0x04101100L),
-U32(0x04001008L),U32(0x04101008L),U32(0x04001108L),U32(0x04101108L),
-U32(0x00020000L),U32(0x00120000L),U32(0x00020100L),U32(0x00120100L),
-U32(0x00020008L),U32(0x00120008L),U32(0x00020108L),U32(0x00120108L),
-U32(0x00021000L),U32(0x00121000L),U32(0x00021100L),U32(0x00121100L),
-U32(0x00021008L),U32(0x00121008L),U32(0x00021108L),U32(0x00121108L),
-U32(0x04020000L),U32(0x04120000L),U32(0x04020100L),U32(0x04120100L),
-U32(0x04020008L),U32(0x04120008L),U32(0x04020108L),U32(0x04120108L),
-U32(0x04021000L),U32(0x04121000L),U32(0x04021100L),U32(0x04121100L),
-U32(0x04021008L),U32(0x04121008L),U32(0x04021108L),U32(0x04121108L),
+U32(0x00000000),U32(0x00100000),U32(0x00000100),U32(0x00100100),
+U32(0x00000008),U32(0x00100008),U32(0x00000108),U32(0x00100108),
+U32(0x00001000),U32(0x00101000),U32(0x00001100),U32(0x00101100),
+U32(0x00001008),U32(0x00101008),U32(0x00001108),U32(0x00101108),
+U32(0x04000000),U32(0x04100000),U32(0x04000100),U32(0x04100100),
+U32(0x04000008),U32(0x04100008),U32(0x04000108),U32(0x04100108),
+U32(0x04001000),U32(0x04101000),U32(0x04001100),U32(0x04101100),
+U32(0x04001008),U32(0x04101008),U32(0x04001108),U32(0x04101108),
+U32(0x00020000),U32(0x00120000),U32(0x00020100),U32(0x00120100),
+U32(0x00020008),U32(0x00120008),U32(0x00020108),U32(0x00120108),
+U32(0x00021000),U32(0x00121000),U32(0x00021100),U32(0x00121100),
+U32(0x00021008),U32(0x00121008),U32(0x00021108),U32(0x00121108),
+U32(0x04020000),U32(0x04120000),U32(0x04020100),U32(0x04120100),
+U32(0x04020008),U32(0x04120008),U32(0x04020108),U32(0x04120108),
+U32(0x04021000),U32(0x04121000),U32(0x04021100),U32(0x04121100),
+U32(0x04021008),U32(0x04121008),U32(0x04021108),U32(0x04121108),
],
#for D bits (numbered as per FIPS 46) 1 2 3 4 5 6
[
-U32(0x00000000L),U32(0x10000000L),U32(0x00010000L),U32(0x10010000L),
-U32(0x00000004L),U32(0x10000004L),U32(0x00010004L),U32(0x10010004L),
-U32(0x20000000L),U32(0x30000000L),U32(0x20010000L),U32(0x30010000L),
-U32(0x20000004L),U32(0x30000004L),U32(0x20010004L),U32(0x30010004L),
-U32(0x00100000L),U32(0x10100000L),U32(0x00110000L),U32(0x10110000L),
-U32(0x00100004L),U32(0x10100004L),U32(0x00110004L),U32(0x10110004L),
-U32(0x20100000L),U32(0x30100000L),U32(0x20110000L),U32(0x30110000L),
-U32(0x20100004L),U32(0x30100004L),U32(0x20110004L),U32(0x30110004L),
-U32(0x00001000L),U32(0x10001000L),U32(0x00011000L),U32(0x10011000L),
-U32(0x00001004L),U32(0x10001004L),U32(0x00011004L),U32(0x10011004L),
-U32(0x20001000L),U32(0x30001000L),U32(0x20011000L),U32(0x30011000L),
-U32(0x20001004L),U32(0x30001004L),U32(0x20011004L),U32(0x30011004L),
-U32(0x00101000L),U32(0x10101000L),U32(0x00111000L),U32(0x10111000L),
-U32(0x00101004L),U32(0x10101004L),U32(0x00111004L),U32(0x10111004L),
-U32(0x20101000L),U32(0x30101000L),U32(0x20111000L),U32(0x30111000L),
-U32(0x20101004L),U32(0x30101004L),U32(0x20111004L),U32(0x30111004L),
+U32(0x00000000),U32(0x10000000),U32(0x00010000),U32(0x10010000),
+U32(0x00000004),U32(0x10000004),U32(0x00010004),U32(0x10010004),
+U32(0x20000000),U32(0x30000000),U32(0x20010000),U32(0x30010000),
+U32(0x20000004),U32(0x30000004),U32(0x20010004),U32(0x30010004),
+U32(0x00100000),U32(0x10100000),U32(0x00110000),U32(0x10110000),
+U32(0x00100004),U32(0x10100004),U32(0x00110004),U32(0x10110004),
+U32(0x20100000),U32(0x30100000),U32(0x20110000),U32(0x30110000),
+U32(0x20100004),U32(0x30100004),U32(0x20110004),U32(0x30110004),
+U32(0x00001000),U32(0x10001000),U32(0x00011000),U32(0x10011000),
+U32(0x00001004),U32(0x10001004),U32(0x00011004),U32(0x10011004),
+U32(0x20001000),U32(0x30001000),U32(0x20011000),U32(0x30011000),
+U32(0x20001004),U32(0x30001004),U32(0x20011004),U32(0x30011004),
+U32(0x00101000),U32(0x10101000),U32(0x00111000),U32(0x10111000),
+U32(0x00101004),U32(0x10101004),U32(0x00111004),U32(0x10111004),
+U32(0x20101000),U32(0x30101000),U32(0x20111000),U32(0x30111000),
+U32(0x20101004),U32(0x30101004),U32(0x20111004),U32(0x30111004),
],
#for D bits (numbered as per FIPS 46) 8 9 11 12 13 14
[
-U32(0x00000000L),U32(0x08000000L),U32(0x00000008L),U32(0x08000008L),
-U32(0x00000400L),U32(0x08000400L),U32(0x00000408L),U32(0x08000408L),
-U32(0x00020000L),U32(0x08020000L),U32(0x00020008L),U32(0x08020008L),
-U32(0x00020400L),U32(0x08020400L),U32(0x00020408L),U32(0x08020408L),
-U32(0x00000001L),U32(0x08000001L),U32(0x00000009L),U32(0x08000009L),
-U32(0x00000401L),U32(0x08000401L),U32(0x00000409L),U32(0x08000409L),
-U32(0x00020001L),U32(0x08020001L),U32(0x00020009L),U32(0x08020009L),
-U32(0x00020401L),U32(0x08020401L),U32(0x00020409L),U32(0x08020409L),
-U32(0x02000000L),U32(0x0A000000L),U32(0x02000008L),U32(0x0A000008L),
-U32(0x02000400L),U32(0x0A000400L),U32(0x02000408L),U32(0x0A000408L),
-U32(0x02020000L),U32(0x0A020000L),U32(0x02020008L),U32(0x0A020008L),
-U32(0x02020400L),U32(0x0A020400L),U32(0x02020408L),U32(0x0A020408L),
-U32(0x02000001L),U32(0x0A000001L),U32(0x02000009L),U32(0x0A000009L),
-U32(0x02000401L),U32(0x0A000401L),U32(0x02000409L),U32(0x0A000409L),
-U32(0x02020001L),U32(0x0A020001L),U32(0x02020009L),U32(0x0A020009L),
-U32(0x02020401L),U32(0x0A020401L),U32(0x02020409L),U32(0x0A020409L),
+U32(0x00000000),U32(0x08000000),U32(0x00000008),U32(0x08000008),
+U32(0x00000400),U32(0x08000400),U32(0x00000408),U32(0x08000408),
+U32(0x00020000),U32(0x08020000),U32(0x00020008),U32(0x08020008),
+U32(0x00020400),U32(0x08020400),U32(0x00020408),U32(0x08020408),
+U32(0x00000001),U32(0x08000001),U32(0x00000009),U32(0x08000009),
+U32(0x00000401),U32(0x08000401),U32(0x00000409),U32(0x08000409),
+U32(0x00020001),U32(0x08020001),U32(0x00020009),U32(0x08020009),
+U32(0x00020401),U32(0x08020401),U32(0x00020409),U32(0x08020409),
+U32(0x02000000),U32(0x0A000000),U32(0x02000008),U32(0x0A000008),
+U32(0x02000400),U32(0x0A000400),U32(0x02000408),U32(0x0A000408),
+U32(0x02020000),U32(0x0A020000),U32(0x02020008),U32(0x0A020008),
+U32(0x02020400),U32(0x0A020400),U32(0x02020408),U32(0x0A020408),
+U32(0x02000001),U32(0x0A000001),U32(0x02000009),U32(0x0A000009),
+U32(0x02000401),U32(0x0A000401),U32(0x02000409),U32(0x0A000409),
+U32(0x02020001),U32(0x0A020001),U32(0x02020009),U32(0x0A020009),
+U32(0x02020401),U32(0x0A020401),U32(0x02020409),U32(0x0A020409),
],
#for D bits (numbered as per FIPS 46) 16 17 18 19 20 21
[
-U32(0x00000000L),U32(0x00000100L),U32(0x00080000L),U32(0x00080100L),
-U32(0x01000000L),U32(0x01000100L),U32(0x01080000L),U32(0x01080100L),
-U32(0x00000010L),U32(0x00000110L),U32(0x00080010L),U32(0x00080110L),
-U32(0x01000010L),U32(0x01000110L),U32(0x01080010L),U32(0x01080110L),
-U32(0x00200000L),U32(0x00200100L),U32(0x00280000L),U32(0x00280100L),
-U32(0x01200000L),U32(0x01200100L),U32(0x01280000L),U32(0x01280100L),
-U32(0x00200010L),U32(0x00200110L),U32(0x00280010L),U32(0x00280110L),
-U32(0x01200010L),U32(0x01200110L),U32(0x01280010L),U32(0x01280110L),
-U32(0x00000200L),U32(0x00000300L),U32(0x00080200L),U32(0x00080300L),
-U32(0x01000200L),U32(0x01000300L),U32(0x01080200L),U32(0x01080300L),
-U32(0x00000210L),U32(0x00000310L),U32(0x00080210L),U32(0x00080310L),
-U32(0x01000210L),U32(0x01000310L),U32(0x01080210L),U32(0x01080310L),
-U32(0x00200200L),U32(0x00200300L),U32(0x00280200L),U32(0x00280300L),
-U32(0x01200200L),U32(0x01200300L),U32(0x01280200L),U32(0x01280300L),
-U32(0x00200210L),U32(0x00200310L),U32(0x00280210L),U32(0x00280310L),
-U32(0x01200210L),U32(0x01200310L),U32(0x01280210L),U32(0x01280310L),
+U32(0x00000000),U32(0x00000100),U32(0x00080000),U32(0x00080100),
+U32(0x01000000),U32(0x01000100),U32(0x01080000),U32(0x01080100),
+U32(0x00000010),U32(0x00000110),U32(0x00080010),U32(0x00080110),
+U32(0x01000010),U32(0x01000110),U32(0x01080010),U32(0x01080110),
+U32(0x00200000),U32(0x00200100),U32(0x00280000),U32(0x00280100),
+U32(0x01200000),U32(0x01200100),U32(0x01280000),U32(0x01280100),
+U32(0x00200010),U32(0x00200110),U32(0x00280010),U32(0x00280110),
+U32(0x01200010),U32(0x01200110),U32(0x01280010),U32(0x01280110),
+U32(0x00000200),U32(0x00000300),U32(0x00080200),U32(0x00080300),
+U32(0x01000200),U32(0x01000300),U32(0x01080200),U32(0x01080300),
+U32(0x00000210),U32(0x00000310),U32(0x00080210),U32(0x00080310),
+U32(0x01000210),U32(0x01000310),U32(0x01080210),U32(0x01080310),
+U32(0x00200200),U32(0x00200300),U32(0x00280200),U32(0x00280300),
+U32(0x01200200),U32(0x01200300),U32(0x01280200),U32(0x01280300),
+U32(0x00200210),U32(0x00200310),U32(0x00280210),U32(0x00280310),
+U32(0x01200210),U32(0x01200310),U32(0x01280210),U32(0x01280310),
],
#for D bits (numbered as per FIPS 46) 22 23 24 25 27 28
[
-U32(0x00000000L),U32(0x04000000L),U32(0x00040000L),U32(0x04040000L),
-U32(0x00000002L),U32(0x04000002L),U32(0x00040002L),U32(0x04040002L),
-U32(0x00002000L),U32(0x04002000L),U32(0x00042000L),U32(0x04042000L),
-U32(0x00002002L),U32(0x04002002L),U32(0x00042002L),U32(0x04042002L),
-U32(0x00000020L),U32(0x04000020L),U32(0x00040020L),U32(0x04040020L),
-U32(0x00000022L),U32(0x04000022L),U32(0x00040022L),U32(0x04040022L),
-U32(0x00002020L),U32(0x04002020L),U32(0x00042020L),U32(0x04042020L),
-U32(0x00002022L),U32(0x04002022L),U32(0x00042022L),U32(0x04042022L),
-U32(0x00000800L),U32(0x04000800L),U32(0x00040800L),U32(0x04040800L),
-U32(0x00000802L),U32(0x04000802L),U32(0x00040802L),U32(0x04040802L),
-U32(0x00002800L),U32(0x04002800L),U32(0x00042800L),U32(0x04042800L),
-U32(0x00002802L),U32(0x04002802L),U32(0x00042802L),U32(0x04042802L),
-U32(0x00000820L),U32(0x04000820L),U32(0x00040820L),U32(0x040RefactoringTool: Refactored ./ntlm/des_c.py
40820L),
-U32(0x00000822L),U32(0x04000822L),U32(0x00040822L),U32(0x04040822L),
-U32(0x00002820L),U32(0x04002820L),U32(0x00042820L),U32(0x04042820L),
-U32(0x00002822L),U32(0x04002822L),U32(0x00042822L),U32(0x04042822L),
+U32(0x00000000),U32(0x04000000),U32(0x00040000),U32(0x04040000),
+U32(0x00000002),U32(0x04000002),U32(0x00040002),U32(0x04040002),
+U32(0x00002000),U32(0x04002000),U32(0x00042000),U32(0x04042000),
+U32(0x00002002),U32(0x04002002),U32(0x00042002),U32(0x04042002),
+U32(0x00000020),U32(0x04000020),U32(0x00040020),U32(0x04040020),
+U32(0x00000022),U32(0x04000022),U32(0x00040022),U32(0x04040022),
+U32(0x00002020),U32(0x04002020),U32(0x00042020),U32(0x04042020),
+U32(0x00002022),U32(0x04002022),U32(0x00042022),U32(0x04042022),
+U32(0x00000800),U32(0x04000800),U32(0x00040800),U32(0x04040800),
+U32(0x00000802),U32(0x04000802),U32(0x00040802),U32(0x04040802),
+U32(0x00002800),U32(0x04002800),U32(0x00042800),U32(0x04042800),
+U32(0x00002802),U32(0x04002802),U32(0x00042802),U32(0x04042802),
+U32(0x00000820),U32(0x04000820),U32(0x00040820),U32(0x04040820),
+U32(0x00000822),U32(0x04000822),U32(0x00040822),U32(0x04040822),
+U32(0x00002820),U32(0x04002820),U32(0x00042820),U32(0x04042820),
+U32(0x00002822),U32(0x04002822),U32(0x00042822),U32(0x04042822),
]
]
--- ./ntlm/des_c.py (original)
+++ ./ntlm/des_c.py (refactored)
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library. If not, see <http://www.gnu.org/licenses/> or <http://www.gnu.org/licenses/lgpl.txt>.
-from U32 import U32
+from .U32 import U32
# --NON ASCII COMMENT ELIDED--
#typedef unsigned char des_cblock[8];
@@ -118,7 +118,7 @@
# array of data
# static unsigned long des_SPtrans[8][64]={
# static unsigned long des_skb[8][64]={
-from des_data import des_SPtrans, des_skb
+from .des_data import des_SPtrans, des_skb
def D_ENCRYPT(tup, u, t, s):
L, R, S = tup
@@ -205,11 +205,11 @@
t = U32(0)
u = U32(0)
- r, l, t = PERM_OP((r, l, t), 4, U32(0x0f0f0f0fL))
- l, r, t = PERM_OP((l, r, t), 16, U32(0x0000ffffL))
- r, l, t = PERM_OP((r, l, t), 2, U32(0x33333333L))
- l, r, t = PERM_OP((l, r, t), 8, U32(0x00ff00ffL))
- r, l, t = PERM_OP((r, l, t), 1, U32(0x55555555L))
+ r, l, t = PERM_OP((r, l, t), 4, U32(0x0f0f0f0f))
+ l, r, t = PERM_OP((l, r, t), 16, U32(0x0000ffff))
+ r, l, t = PERM_OP((r, l, t), 2, U32(0x33333333))
+ l, r, t = PERM_OP((l, r, t), 8, U32(0x00ff00ff))
+ r, l, t = PERM_OP((r, l, t), 1, U32(0x55555555))
t = (r << 1)|(r >> 31)
r = (l << 1)|(l >> 31)
@@ -237,11 +237,11 @@
l = (l >> 1)|(l << 31)
r = (r >> 1)|(r << 31)
- r, l, t = PERM_OP((r, l, t), 1, U32(0x55555555L))
- l, r, t = PERM_OP((l, r, t), 8, U32(0x00ff00ffL))
- r, l, t = PERM_OP((r, l, t), 2, U32(0x33333333L))
- l, r, t = PERM_OP((l, r, t), 16, U32(0x0000ffffL))
- r, l, t = PERM_OP((r, l, t), 4, U32(0x0f0f0f0fL))
+ r, l, t = PERM_OP((r, l, t), 1, U32(0x55555555))
+ l, r, t = PERM_OP((l, r, t), 8, U32(0x00ff00ff))
+ r, l, t = PERM_OP((r, l, t), 2, U32(0x33333333))
+ l, r, t = PERM_OP((l, r, t), 16, U32(0x0000ffff))
+ r, l, t = PERM_OP((r, l, t), 4, U32(0x0f0f0f0f))
output = [l]
output.append(r)
@@ -287,15 +287,15 @@
d = c2l(key[4:8])
t = U32(0)
- d, c, t = PERM_OP((d, c, t), 4, U32(0x0f0f0f0fL))
- c, t = HPERM_OP((c, t), -2, U32(0xcccc0000L))
- d, t = HPERM_OP((d, t), -2, U32(0xcccc0000L))
- d, c, t = PERM_OP((d, c, t), 1, U32(0x55555555L))
- c, d, t = PERM_OP((c, d, t), 8, U32(0x00ff00ffL))
- d, c, t = PERM_OP((d, c, t), 1, U32(0x55555555L))
-
- d = (((d & U32(0x000000ffL)) << 16)|(d & U32(0x0000ff00L))|((d & U32(0x00ff0000L)) >> 16)|((c & U32(0xf0000000L)) >> 4))
- c = c & U32(0x0fffffffL)
+ d, c, t = PERM_OP((d, c, t), 4, U32(0x0f0f0f0f))
+ c, t = HPERM_OP((c, t), -2, U32(0xcccc0000))
+ d, t = HPERM_OP((d, t), -2, U32(0xcccc0000))
+ d, c, t = PERM_OP((d, c, t), 1, U32(0x55555555))
+ c, d, t = PERM_OP((c, d, t), 8, U32(0x00ff00ff))
+ d, cRefactoringTool: Refactored ./ntlm/des.py
RefactoringTool: Refactored ./ntlm/U32.py
RefactoringTool: Refactored ./ntlm/HTTPNtlmAuthHandler.py
, t = PERM_OP((d, c, t), 1, U32(0x55555555))
+
+ d = (((d & U32(0x000000ff)) << 16)|(d & U32(0x0000ff00))|((d & U32(0x00ff0000)) >> 16)|((c & U32(0xf0000000)) >> 4))
+ c = c & U32(0x0fffffff)
for i in range(16):
if (shifts2[i]):
@@ -304,8 +304,8 @@
else:
c = ((c >> 1)|(c << 27))
d = ((d >> 1)|(d << 27))
- c = c & U32(0x0fffffffL)
- d = d & U32(0x0fffffffL)
+ c = c & U32(0x0fffffff)
+ d = d & U32(0x0fffffff)
s= des_skb[0][int((c ) & U32(0x3f))]|\
des_skb[1][int(((c>> 6) & U32(0x03))|((c>> 7) & U32(0x3c)))]|\
@@ -318,10 +318,10 @@
des_skb[7][int(((d>>21) & U32(0x0f))|((d>>22) & U32(0x30)))]
#print s, t
- k.append(((t << 16)|(s & U32(0x0000ffffL))) & U32(0xffffffffL))
- s = ((s >> 16)|(t & U32(0xffff0000L)))
+ k.append(((t << 16)|(s & U32(0x0000ffff))) & U32(0xffffffff))
+ s = ((s >> 16)|(t & U32(0xffff0000)))
s = (s << 4)|(s >> 28)
- k.append(s & U32(0xffffffffL))
+ k.append(s & U32(0xffffffff))
schedule = k
--- ./ntlm/des.py (original)
+++ ./ntlm/des.py (refactored)
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library. If not, see <http://www.gnu.org/licenses/> or <http://www.gnu.org/licenses/lgpl.txt>.
-import des_c
+from . import des_c
#---------------------------------------------------------------------
class DES:
--- ./ntlm/U32.py (original)
+++ ./ntlm/U32.py (refactored)
@@ -15,25 +15,25 @@
# License along with this library. If not, see <http://www.gnu.org/licenses/> or <http://www.gnu.org/licenses/lgpl.txt>.
-C = 0x1000000000L
+C = 0x1000000000
def norm(n):
- return n & 0xFFFFFFFFL
+ return n & 0xFFFFFFFF
class U32:
- v = 0L
+ v = 0
def __init__(self, value = 0):
- self.v = C + norm(abs(long(value)))
+ self.v = C + norm(abs(int(value)))
def set(self, value = 0):
- self.v = C + norm(abs(long(value)))
+ self.v = C + norm(abs(int(value)))
def __repr__(self):
return hex(norm(self.v))
- def __long__(self): return long(norm(self.v))
+ def __long__(self): return int(norm(self.v))
def __int__(self): return int(norm(self.v))
def __chr__(self): return chr(norm(self.v))
@@ -45,7 +45,7 @@
def __sub__(self, b):
r = U32()
if self.v < b.v:
- r.v = C + norm(0x100000000L - (b.v - self.v))
+ r.v = C + norm(0x100000000 - (b.v - self.v))
else: r.v = C + norm(self.v - b.v)
return r
@@ -109,5 +109,5 @@
elif norm(self.v) < norm(b.v): return -1
else: return 0
- def __nonzero__(self):
+ def __bool__(self):
return norm(self.v)
--- ./ntlm/HTTPNtlmAuthHandler.py (original)
+++ ./ntlm/HTTPNtlmAuthHandler.py (refactored)
@@ -11,10 +11,10 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library. If not, see <http://www.gnu.org/licenses/> or <http://www.gnu.org/licenses/lgpl.txt>.
-import urllib2
-import httplib, socket
+import urllib.request, urllib.error, urllib.parse
+import http.client, socket
from urllib import addinfourl
-import ntlm
+from . import ntlm
import re
class AbstractNtlmAuthHandler:
@@ -28,7 +28,7 @@
>>> abstrct = AbstractNtlmAuthHandler(urllib2.HTTPPasswordMgrWithDefaultRealm())
"""
if password_mgr is None:
- password_mgr = urllib2.HTTPPasswordMgr()
+ password_mgr = urllib.request.HTTPPasswordMgr()
self.passwd = password_mgr
self.add_password = self.passwd.add_password
self._debuglevel = debuglevel
@@ -65,16 +65,16 @@
host = req.get_host()
if not host:
- raise urllib2.URLError('no host given')
+ raise urllib.error.URLError('no host given')
h = None
if req.get_full_url().startswith('https://'):
- h = httplib.HTTPSConnection(host) # will parse host:poRefactoringTool: Files that were modified:
RefactoringTool: ./setup.py
RefactoringTool: ./ntlm/ntlm.py
RefactoringTool: ./ntlm/des_data.py
RefactoringTool: ./ntlm/des_c.py
RefactoringTool: ./ntlm/des.py
RefactoringTool: ./ntlm/U32.py
RefactoringTool: ./ntlm/HTTPNtlmAuthHandler.py
rt
+ h = http.client.HTTPSConnection(host) # will parse host:port
else:
- h = httplib.HTTPConnection(host) # will parse host:port
+ h = http.client.HTTPConnection(host) # will parse host:port
h.set_debuglevel(self._debuglevel)
# we must keep the connection because NTLM authenticates the connection, not single requests
headers["Connection"] = "Keep-Alive"
- headers = dict((name.title(), val) for name, val in headers.items())
+ headers = dict((name.title(), val) for name, val in list(headers.items()))
h.request(req.get_method(), req.get_selector(), req.data, headers)
r = h.getresponse()
r.begin()
@@ -95,7 +95,7 @@
auth = 'NTLM %s' % ntlm.create_NTLM_AUTHENTICATE_MESSAGE(ServerChallenge, UserName, DomainName, pw, NegotiateFlags)
headers[self.auth_header] = auth
headers["Connection"] = "Close"
- headers = dict((name.title(), val) for name, val in headers.items())
+ headers = dict((name.title(), val) for name, val in list(headers.items()))
try:
h.request(req.get_method(), req.get_selector(), req.data, headers)
# none of the configured handlers are triggered, for example redirect-responses are not handled!
@@ -107,13 +107,13 @@
infourl.code = response.status
infourl.msg = response.reason
return infourl
- except socket.error, err:
- raise urllib2.URLError(err)
+ except socket.error as err:
+ raise urllib.error.URLError(err)
else:
return None
-class HTTPNtlmAuthHandler(AbstractNtlmAuthHandler, urllib2.BaseHandler):
+class HTTPNtlmAuthHandler(AbstractNtlmAuthHandler, urllib.request.BaseHandler):
auth_header = 'Authorization'
@@ -121,7 +121,7 @@
return self.http_error_authentication_required('www-authenticate', req, fp, headers)
-class ProxyNtlmAuthHandler(AbstractNtlmAuthHandler, urllib2.BaseHandler):
+class ProxyNtlmAuthHandler(AbstractNtlmAuthHandler, urllib.request.BaseHandler):
"""
CAUTION: this class has NOT been tested at all!!!
use at your own risk
+ CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export CFLAGS
+ CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export CXXFLAGS
+ FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export FFLAGS
+ /usr/bin/python3 setup.py build --debug
running build
running build_py
creating build
creating build/lib
creating build/lib/ntlm
copying ntlm/ntlm.py -> build/lib/ntlm
copying ntlm/des_data.py -> build/lib/ntlm
copying ntlm/des_c.py -> build/lib/ntlm
copying ntlm/des.py -> build/lib/ntlm
copying ntlm/__init__.py -> build/lib/ntlm
copying ntlm/U32.py -> build/lib/ntlm
copying ntlm/HTTPNtlmAuthHandler.py -> build/lib/ntlm
+ popd
~/RPM/BUILD/python-module-ntlm-1.1.0
+ exit 0
Executing(%install): /bin/sh -e /usr/src/tmp/rpm-tmp.57755
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ /bin/chmod -Rf u+rwX -- /usr/src/tmp/python-module-ntlm-buildroot
+ :
+ /bin/rm -rf -- /usr/src/tmp/python-module-ntlm-buildroot
+ PATH=/usr/libexec/rpm-build:/usr/src/bin:/bin:/usr/bin:/usr/X11R6/bin:/usr/games
+ cd python-module-ntlm-1.1.0
+ pushd ../python3
~/RPM/BUILD/python3 ~/RPM/BUILD/python-module-ntlm-1.1.0
+ CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export CFLAGS
+ CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export CXXFLAGS
+ FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export FFLAGS
+ /usr/bin/python3 setup.py install --skip-build --root=/usr/src/tmp/python-module-ntlm-buildroot --force
running install
running install_lib
creating /usr/src/tmp/python-module-ntlm-buildroot
creating /usr/src/tmp/python-module-ntlm-buildroot/usr
creating /usr/src/tmp/python-module-ntlm-buildroot/usr/lib
creating /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3
creating /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages
creating /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm
copying build/lib/ntlm/HTTPNtlmAuthHandler.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm
copying build/lib/ntlm/U32.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm
copying build/lib/ntlm/__init__.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm
copying build/lib/ntlm/des.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm
copying build/lib/ntlm/des_c.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm
copying build/lib/ntlm/des_data.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm
copying build/lib/ntlm/ntlm.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/HTTPNtlmAuthHandler.py to HTTPNtlmAuthHandler.cpython-37.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/U32.py to U32.cpython-37.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__init__.py to __init__.cpython-37.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des.py to des.cpython-37.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_c.py to des_c.cpython-37.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_data.py to des_data.cpython-37.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/ntlm.py to ntlm.cpython-37.pyc
running install_egg_info
running egg_info
writing python_ntlm.egg-info/PKG-INFO
writing dependency_links to python_ntlm.egg-info/dependency_links.txt
writing entry points to python_ntlm.egg-info/entry_points.txt
writing top-level names to python_ntlm.egg-info/top_level.txt
reading manifest file 'python_ntlm.egg-info/SOURCES.txt'
writing manifest file 'python_ntlm.egg-info/SOURCES.txt'
Copying python_ntlm.egg-info to /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/python_ntlm-1.1.0-py3.7.egg-info
running install_scripts
Installing ntlm_example_extended script to /usr/src/tmp/python-module-ntlm-buildroot/usr/bin
Installing ntlm_example_simple script to /usr/src/tmp/python-module-ntlm-buildroot/usr/bin
+ popd
~/RPM/BUILD/python-module-ntlm-1.1.0
+ pushd /usr/src/tmp/python-module-ntlm-buildroot/usr/bin
~/tmp/python-module-ntlm-buildroot/usr/bin ~/RPM/BUILD/python-module-ntlm-1.1.0
++ ls
+ for i in $(ls)
+ mv ntlm_example_extended ntlm_example_extended.py3
+ for i in $(ls)
+ mv ntlm_example_simple ntlm_example_simple.py3
+ popd
~/RPM/BUILD/python-module-ntlm-1.1.0
+ CFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export CFLAGS
+ CXXFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export CXXFLAGS
+ FFLAGS='-pipe -frecord-gcc-switches -Wall -g -O2'
+ export FFLAGS
+ /usr/bin/python2.7 setup.py install --skip-build --root=/usr/src/tmp/python-module-ntlm-buildroot --force
running install
running install_lib
creating /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7
creating /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages
creating /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm
copying build/lib/ntlm/HTTPNtlmAuthHandler.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm
copying build/lib/ntlm/U32.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm
copying build/lib/ntlm/__init__.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm
copying build/lib/ntlm/des.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm
copying build/lib/ntlm/des_c.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm
copying build/lib/ntlm/des_data.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm
copying build/lib/ntlm/ntlm.py -> /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/HTTPNtlmAuthHandler.py to HTTPNtlmAuthHandler.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/U32.py to U32.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/__init__.py to __init__.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des.py to des.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_c.py to des_c.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_data.py to des_data.pyc
byte-compiling /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/ntlm.py to ntlm.pyc
running install_egg_info
running egg_info
writing python_ntlm.egg-info/PKG-INFO
writing top-level names to python_ntlm.egg-info/top_level.txt
writing dependency_links to python_ntlm.egg-info/dependency_links.txt
writing entry points to python_ntlm.egg-info/entry_points.txt
reading manifest file 'python_ntlm.egg-info/SOURCES.txt'
writing manifest file 'python_ntlm.egg-info/SOURCES.txt'
Copying python_ntlm.egg-info to /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/python_ntlm-1.1.0-py2.7.egg-info
running install_scripts
Installing ntlm_example_extended script to /usr/src/tmp/python-module-ntlm-buildroot/usr/bin
Installing ntlm_example_simple script to /usr/src/tmp/python-module-ntlm-buildroot/usr/bin
+ /usr/lib/rpm/brp-alt
Cleaning files in /usr/src/tmp/python-module-ntlm-buildroot (auto)
Verifying and fixing files in /usr/src/tmp/python-module-ntlm-buildroot (binconfig,pkgconfig,libtool,desktop,gnuconfig)
Checking contents of files in /usr/src/tmp/python-module-ntlm-buildroot/ (default)
Compressing files in /usr/src/tmp/python-module-ntlm-buildroot (auto)
Adjusting library links in /usr/src/tmp/python-module-ntlm-buildroot
./usr/lib:
Verifying ELF objects in /usr/src/tmp/python-module-ntlm-buildroot (arch=normal,fhs=normal,lfs=relaxed,lint=relaxed,rpath=normal,stack=normal,textrel=normal,unresolved=normal)
Bytecompiling python modules in /usr/src/tmp/python-module-ntlm-buildroot using /usr/bin/python2.7
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/HTTPNtlmAuthHandler.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/U32.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/__init__.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_c.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_data.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/ntlm.pyc
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/HTTPNtlmAuthHandler.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/U32.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/__init__.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_c.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_data.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/ntlm.py
Bytecompiling python modules with optimization in /usr/src/tmp/python-module-ntlm-buildroot using /usr/bin/python2.7 -O
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/HTTPNtlmAuthHandler.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/U32.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/__init__.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_c.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_data.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/ntlm.py
Bytecompiling python3 modules in /usr/src/tmp/python-module-ntlm-buildroot using /usr/bin/python3
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__pycache__/HTTPNtlmAuthHandler.cpython-37.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__pycache__/U32.cpython-37.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__pycache__/__init__.cpython-37.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__pycache__/des.cpython-37.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__pycache__/des_c.cpython-37.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__pycache__/des_data.cpython-37.pyc
unlink /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__pycache__/ntlm.cpython-37.pyc
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/HTTPNtlmAuthHandler.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/U32.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__init__.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_c.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_data.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/ntlm.py
Bytecompiling python3 modules with optimization in /usr/src/tmp/python-module-ntlm-buildroot using /usr/bin/python3 -O
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/HTTPNtlmAuthHandler.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/U32.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__init__.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_c.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_data.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/ntlm.py
Bytecompiling python3 modules with optimization-2 in /usr/src/tmp/python-module-ntlm-buildroot using /usr/bin/python3 -OO
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/HTTPNtlmAuthHandler.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/U32.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/__init__.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_c.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_data.py
compile /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/ntlm.py
Hardlinking identical .pyc and .opt-?.pyc files
'./usr/lib/python3/site-packages/ntlm/__pycache__/des_data.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/ntlm/__pycache__/des_data.cpython-37.pyc'
'./usr/lib/python3/site-packages/ntlm/__pycache__/des_data.cpython-37.opt-2.pyc' => './usr/lib/python3/site-packages/ntlm/__pycache__/des_data.cpython-37.opt-1.pyc'
'./usr/lib/python3/site-packages/ntlm/__pycache__/des_c.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/ntlm/__pycache__/des_c.cpython-37.pyc'
'./usr/lib/python3/site-packages/ntlm/__pycache__/des.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/ntlm/__pycache__/des.cpython-37.pyc'
'./usr/lib/python3/site-packages/ntlm/__pycache__/__init__.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/ntlm/__pycache__/__init__.cpython-37.pyc'
'./usr/lib/python3/site-packages/ntlm/__pycache__/__init__.cpython-37.opt-2.pyc' => './usr/lib/python3/site-packages/ntlm/__pycache__/__init__.cpython-37.opt-1.pyc'
'./usr/lib/python3/site-packages/ntlm/__pycache__/U32.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/ntlm/__pycache__/U32.cpython-37.pyc'
'./usr/lib/python3/site-packages/ntlm/__pycache__/U32.cpython-37.opt-2.pyc' => './usr/lib/python3/site-packages/ntlm/__pycache__/U32.cpython-37.opt-1.pyc'
'./usr/lib/python3/site-packages/ntlm/__pycache__/HTTPNtlmAuthHandler.cpython-37.opt-1.pyc' => './usr/lib/python3/site-packages/ntlm/__pycache__/HTTPNtlmAuthHandler.cpython-37.pyc'
Hardlinking identical .pyc and .pyo files
'./usr/lib/python2.7/site-packages/ntlm/des_data.pyo' => './usr/lib/python2.7/site-packages/ntlm/des_data.pyc'
'./usr/lib/python2.7/site-packages/ntlm/des_c.pyo' => './usr/lib/python2.7/site-packages/ntlm/des_c.pyc'
'./usr/lib/python2.7/site-packages/ntlm/des.pyo' => './usr/lib/python2.7/site-packages/ntlm/des.pyc'
'./usr/lib/python2.7/site-packages/ntlm/__init__.pyo' => './usr/lib/python2.7/site-packages/ntlm/__init__.pyc'
'./usr/lib/python2.7/site-packages/ntlm/U32.pyo' => './usr/lib/python2.7/site-packages/ntlm/U32.pyc'
'./usr/lib/python2.7/site-packages/ntlm/HTTPNtlmAuthHandler.pyo' => './usr/lib/python2.7/site-packages/ntlm/HTTPNtlmAuthHandler.pyc'
Processing files: python-module-ntlm-1.1.0-alt1.2
Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.4590
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd python-module-ntlm-1.1.0
+ DOCDIR=/usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python-module-ntlm-1.1.0
+ export DOCDIR
+ rm -rf /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python-module-ntlm-1.1.0
+ /bin/mkdir -p /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python-module-ntlm-1.1.0
+ cp -prL PKG-INFO /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python-module-ntlm-1.1.0
+ chmod -R go-w /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python-module-ntlm-1.1.0
+ chmod -R a+rX /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python-module-ntlm-1.1.0
+ exit 0
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.jNAHO7
find-provides: running scripts (alternatives,debuginfo,lib,pam,perl,pkgconfig,python,python3,shell)
Finding Requires (using /usr/lib/rpm/find-requires)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.6uaVmF
find-requires: running scripts (cpp,debuginfo,files,lib,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services)
python.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/bin/ntlm_example_extended: skipping sys
python.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/bin/ntlm_example_simple: skipping sys
python.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/HTTPNtlmAuthHandler.py: hiding ntlm, which SEEMS TO BE SELF-SATISFIED
/usr/lib/rpm/python.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/HTTPNtlmAuthHandler.py: line=136 IGNORE (for REQ=slight and deep=8) module=doctest
python.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des.py: hiding des_c, which SEEMS TO BE SELF-SATISFIED
python.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_c.py: hiding U32, which SEEMS TO BE SELF-SATISFIED
python.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_c.py: hiding des_data, which SEEMS TO BE SELF-SATISFIED
python.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/des_data.py: hiding U32, which SEEMS TO BE SELF-SATISFIED
python.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/ntlm.py: hiding des, which SEEMS TO BE SELF-SATISFIED
/usr/lib/rpm/python.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python2.7/site-packages/ntlm/ntlm.py: line=372 IGNORE (for REQ=slight and deep=8) module=hashlib
Provides: python2.7-module-ntlm = 1.1.0-alt1.2, python2.7(ntlm), python2.7(ntlm.HTTPNtlmAuthHandler), python2.7(ntlm.U32), python2.7(ntlm.des), python2.7(ntlm.des_c), python2.7(ntlm.des_data), python2.7(ntlm.ntlm)
Requires: python = 2.7, /usr/bin/python2.7, /usr/lib/python2.7/site-packages, python-modules, python2.7(pkg_resources)
Processing files: python3-module-ntlm-1.1.0-alt1.2
Executing(%doc): /bin/sh -e /usr/src/tmp/rpm-tmp.7975
+ umask 022
+ /bin/mkdir -p /usr/src/RPM/BUILD
+ cd /usr/src/RPM/BUILD
+ cd python-module-ntlm-1.1.0
+ DOCDIR=/usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python3-module-ntlm-1.1.0
+ export DOCDIR
+ rm -rf /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python3-module-ntlm-1.1.0
+ /bin/mkdir -p /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python3-module-ntlm-1.1.0
+ cp -prL PKG-INFO /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python3-module-ntlm-1.1.0
+ chmod -R go-w /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python3-module-ntlm-1.1.0
+ chmod -R a+rX /usr/src/tmp/python-module-ntlm-buildroot/usr/share/doc/python3-module-ntlm-1.1.0
+ exit 0
Finding Provides (using /usr/lib/rpm/find-provides)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.PObzih
find-provides: running scripts (alternatives,debuginfo,lib,pam,perl,pkgconfig,python,python3,shell)
Finding Requires (using /usr/lib/rpm/find-requires)
Executing: /bin/sh -e /usr/src/tmp/rpm-tmp.cvRnSW
find-requires: running scripts (cpp,debuginfo,files,lib,pam,perl,pkgconfig,pkgconfiglib,python,python3,rpmlib,shebang,shell,static,symlinks,systemd-services)
python3.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/bin/ntlm_example_extended.py3: skipping sys
python3.req: /usr/src/tmp/python-module-ntlm-buildroot/usr/bin/ntlm_example_simple.py3: skipping sys
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/HTTPNtlmAuthHandler.py: line=17 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/HTTPNtlmAuthHandler.py: line=136 IGNORE (for REQ=slight and deep=8) module=doctest
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des.py: line=17 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_c.py: line=17 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_c.py: line=121 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/des_data.py: line=17 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/ntlm.py: line=17 possible relative import from ., UNIMPLEMENTED
/usr/lib/rpm/python3.req.py: /usr/src/tmp/python-module-ntlm-buildroot/usr/lib/python3/site-packages/ntlm/ntlm.py: line=372 IGNORE (for REQ=slight and deep=8) module=hashlib
Provides: python3(ntlm), python3(ntlm.HTTPNtlmAuthHandler), python3(ntlm.U32), python3(ntlm.des), python3(ntlm.des_c), python3(ntlm.des_data), python3(ntlm.ntlm)
Requires: /usr/bin/python3, /usr/lib/python3/site-packages, python3(base64) < 0, python3(binascii) < 0, python3(hashlib) < 0, python3(hmac) < 0, python3(http.client) < 0, python3(pkg_resources) < 0, python3(random) < 0, python3(re) < 0, python3(socket) < 0, python3(string) < 0, python3(struct) < 0, python3(urllib) < 0, python3(urllib.error) < 0, python3(urllib.parse) < 0, python3(urllib.request) < 0
Wrote: /usr/src/RPM/RPMS/noarch/python-module-ntlm-1.1.0-alt1.2.noarch.rpm (w2.lzdio)
Wrote: /usr/src/RPM/RPMS/noarch/python3-module-ntlm-1.1.0-alt1.2.noarch.rpm (w2.lzdio)
4.44user 1.31system 0:09.21elapsed 62%CPU (0avgtext+0avgdata 36144maxresident)k
0inputs+0outputs (0major+325797minor)pagefaults 0swaps
3.80user 1.63system 0:20.07elapsed 27%CPU (0avgtext+0avgdata 135080maxresident)k
0inputs+0outputs (0major+305762minor)pagefaults 0swaps