Skip to content

Small bugfixes of errors in python-script #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ham45X13y wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −9
Open

Small bugfixes of errors in python-script #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions discreteLogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@


def main():
p = input("Input prime for mod value: ")
l = input("Input log base: ")
e = input("Input Number: ")
p = int(input("Input prime for mod value: "))
l = int(input("Input log base: "))
e = int(input("Input Number: "))
print("Pick Algorithm:")
print("[1] Divide and Conquer")
print("[2] Pohlig-Hellman")
print("[3] Both")
algo = input("Enter number: ")
algo = int(input("Enter number: "))
now = datetime.now()
start = timedelta(hours=now.hour, minutes=now.minute, seconds=now.second, microseconds=now.microsecond)
if(algo == 1):
Expand Down Expand Up @@ -85,7 +85,7 @@ def computeBValues(b,l,p,e):
i = 0
b_values={}
while(i <= b):
num = (e*pow(modinv(l,p), i, p))%p
num = (e*pow(int(modinv(l,p)), int(i), int(p)))%p
b_values.update({num: i})
i+= 1
return b_values
Expand Down Expand Up @@ -152,14 +152,14 @@ def getXModP(e, l, p, fac, pwr):
order = (p-1)/fac
eCurrent = e
xFinal = 0
lRaisedModp = pow(l, order, p)
lRaisedModp = pow(int(l),int(order), int(p))
facPow = 1
lInv = modinv(l,p)
for i in range(0,pwr):
eRaisedModp = pow(eCurrent, order, p)
eRaisedModp = pow(int(eCurrent), int(order), int(p))
xCurrent = bruteForce(lRaisedModp, eRaisedModp, p)
xFinal += xCurrent*facPow
eCurrent = eCurrent*pow(lInv, xCurrent*facPow, p) % p
eCurrent = eCurrent*pow(int(lInv), int(xCurrent*facPow), int(p)) % p
facPow *= fac
order /= fac
return (xFinal,facPow)
Expand Down Expand Up @@ -187,7 +187,7 @@ def crt(pairs):
try:
main()
except KeyboardInterrupt:
print 'oops... interrupted \_[o.O]_/'
print ('oops... interrupted \_[o.O]_/')
try:
sys.exit(0)
except SystemExit:
Expand Down