mirrors/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2025-04-21 15:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolved conflict

Browse source
This commit is contained in:
n1474335 2017-12-19 14:31:40 +00:00
commit 5d75f8636a
3 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/operations/OTP.js
View file

@ -1,5 +1,6 @@
import otp from "otp";
import Base64 from "./Base64.js";
import Utils from "../Utils.js";
/**
* One-Time Password operations.
@ -24,7 +25,7 @@ const OTP = {
name: args[0],
keySize: args[1],
codeLength: args[2],
secret: Base64.runTo32(input, []),
secret: Base64.runTo32(Utils.strToByteArray(input), []),
epoch: args[3],
timeSlice: args[4]
});
@ -44,7 +45,7 @@ const OTP = {
name: args[0],
keySize: args[1],
codeLength: args[2],
secret: Base64.runTo32(input, []),
secret: Base64.runTo32(Utils.strToByteArray(input), []),
});
const counter = args[3];
return `URI: ${otpObj.hotpURL}\n\nPassword: ${otpObj.hotp(counter)}`;