Skip to content

Commit

Permalink
Merge branch 'webpack-ready'
Browse files Browse the repository at this point in the history
  • Loading branch information
BastienClement committed Feb 25, 2022
2 parents 5b4775e + cc049b7 commit 304482d
Show file tree
Hide file tree
Showing 15 changed files with 1,997 additions and 3,812 deletions.
3 changes: 0 additions & 3 deletions .bowerrc

This file was deleted.

9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[*]
root = true
charset = utf-8
end_of_line = lf
insert_final_newline = true

[*.js]
indent_style = space
indent_size = 4
7 changes: 3 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
node_modules/
*.iml
.idea

node_modules/
*.iml
.idea
124 changes: 0 additions & 124 deletions demo/app/main.js

This file was deleted.

66 changes: 0 additions & 66 deletions demo/app/siege.js

This file was deleted.

87 changes: 0 additions & 87 deletions demo/index.html

This file was deleted.

58 changes: 2 additions & 56 deletions dist/session.min.js

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions dist/session.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/** @preserve
* Counter block mode compatible with Dr Brian Gladman fileenc.c
* derived from CryptoJS.mode.CTR
* Jan Hruby [email protected]
*/

/** @preserve
(c) 2012 by Cédric Mesnil. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
2 changes: 1 addition & 1 deletion dist/session.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/otp.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*jslint browser: true */
/*global define */

define(['cryptojs'], function (CryptoJS) {
define(['crypto-js'], function (CryptoJS) {
'use strict';

var /**
Expand Down
2 changes: 1 addition & 1 deletion lib/session.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*jslint browser: true */
/*global define */

define(['srp', 'jquery', 'otp', 'cryptojs'], function (Srp, jQuery, Otp, CryptoJS) {
define(['srp', 'jquery', 'otp', 'crypto-js'], function (Srp, jQuery, Otp, CryptoJS) {
'use strict';

var /**
Expand Down
2 changes: 1 addition & 1 deletion lib/srp.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*jslint browser: true */
/*global define */

define(['bignum', 'cryptojs'], function (Bn, CryptoJS) {
define(['bignum', 'crypto-js'], function (Bn, CryptoJS) {
'use strict';

/**
Expand Down
Loading

0 comments on commit 304482d

Please sign in to comment.