fix module structure

seksu · Dec 14, 2017 · 9e237c2 · 9e237c2
1 parent aa12418
commit 9e237c2
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/lib/jsbn/base64.js b/lib/jsbn/base64.js
@@ -1,4 +1,4 @@
-import {int2char} from "./jsbn";
+import {int2char} from "./util";
 
 var b64map="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 var b64pad="=";

diff --git a/lib/jsbn/jsbn.js b/lib/jsbn/jsbn.js
@@ -4,6 +4,7 @@
 
 // Basic JavaScript BN library - subset useful for RSA encryption.
 
+import {int2char} from "./util";
 // Bits per digit
 var dbits;
 
@@ -92,7 +93,6 @@ BigInteger.prototype.F1 = BI_FP-dbits;
 BigInteger.prototype.F2 = 2*dbits-BI_FP;
 
 // Digit conversions
-var BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz";
 var BI_RC = new Array();
 var rr,vv;
 rr = "0".charCodeAt(0);
@@ -102,7 +102,7 @@ for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
 rr = "A".charCodeAt(0);
 for(vv = 10; vv < 36; ++vv) BI_RC[rr++] = vv;
 
-export function int2char(n) { return BI_RM.charAt(n); }
+
 export function intAt(s,i) {
   var c = BI_RC[s.charCodeAt(i)];
   return (c==null)?-1:c;

diff --git a/lib/jsbn/jsbn2.js b/lib/jsbn/jsbn2.js
@@ -10,6 +10,10 @@
 import {BigInteger, nbi, nbv, nbits, intAt, Classic, Montgomery} from "./jsbn";
 export {BigInteger} from "./jsbn";
 
+export function parseBigInt(str,r) {
+  return new BigInteger(str,r);
+}
+
 // (public)
 function bnClone() { var r = nbi(); this.copyTo(r); return r; }
 

diff --git a/lib/jsbn/rsa.js b/lib/jsbn/rsa.js
@@ -4,14 +4,10 @@
 
 // convert a (hex) string to a bignum object
 
-import {BigInteger} from "./jsbn2";
+import {BigInteger, parseBigInt} from "./jsbn2";
 import {SecureRandom} from "./rng";
 
 
-export function parseBigInt(str,r) {
-  return new BigInteger(str,r);
-}
-
 function linebrk(s,n) {
   var ret = "";
   var i = 0;

diff --git a/lib/jsbn/rsa2.js b/lib/jsbn/rsa2.js
@@ -1,6 +1,6 @@
 import {SecureRandom} from "./rng";
-import {BigInteger} from "./jsbn";
-import {parseBigInt} from "./rsa";
+import {BigInteger} from "./jsbn2";
+import {parseBigInt} from "./jsbn2";
 import {RSAKey} from "./rsa";
 export {RSAKey} from "./rsa";
 

diff --git a/lib/jsbn/util.ts b/lib/jsbn/util.ts
@@ -0,0 +1,7 @@
+
+
+const BI_RM = "0123456789abcdefghijklmnopqrstuvwxyz";
+
+export function int2char(n:number) {
+    return BI_RM.charAt(n);
+}
diff --git a/src/jsencrypt.js b/src/jsencrypt.js
@@ -2,7 +2,7 @@ import {ASN1} from "../lib/asn1js/asn1";
 import {RSAKey} from "../lib/jsbn/rsa2";
 import {Base64} from "../lib/asn1js/base64";
 import {Hex} from "../lib/asn1js/hex";
-import {parseBigInt} from "../lib/jsbn/rsa";
+import {parseBigInt} from "../lib/jsbn/jsbn2";
 import {KJUR} from "../lib/jsrsasign/asn1-1.0";
 import {hex2b64} from "../lib/jsbn/base64";
 import {b64tohex} from "../lib/jsbn/base64";