colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile curve25519/webcrypto into libtextsecure.js

Browse Source
This commit is contained in:
Matt Corallo
2015-01-13 15:49:38 -10:00
parent 07899557dc
commit 5785f4033c
10 changed files with 2895 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gruntfile.js
View File

@@ -31,7 +31,7 @@ module.exports = function(grunt) {
'build/curve25519_compiled.js', 'build/curve25519_compiled.js',
'build/curve25519.js', 'build/curve25519.js',
], ],
dest: 'js/curve25519_compiled.js', dest: 'libtextsecure/curve25519_concat.js',
options: { options: {
banner: ';(function(){\n', banner: ';(function(){\n',
footer: '\n})();' footer: '\n})();'
@@ -49,7 +49,7 @@ module.exports = function(grunt) {
'components/cryptojs/src/aes.js', 'components/cryptojs/src/aes.js',
'build/webcrypto.js' 'build/webcrypto.js'
], ],
dest: 'js/webcrypto.js', dest: 'libtextsecure/webcrypto_concat.js',
options: { options: {
banner: ';(function(){\n', banner: ';(function(){\n',
footer: '\n})();' footer: '\n})();'
@@ -65,6 +65,10 @@ module.exports = function(grunt) {
}, },
libtextsecure: { libtextsecure: {
src: [ src: [
'libtextsecure/curve25519_concat.js',
'libtextsecure/nativeclient.js',
'libtextsecure/webcrypto_concat.js',
'libtextsecure/protobufs.js', 'libtextsecure/protobufs.js',
'libtextsecure/websocket.js', 'libtextsecure/websocket.js',
'libtextsecure/websocket-resources.js', 'libtextsecure/websocket-resources.js',

5
background.html
View File

@@ -16,11 +16,6 @@
<html> <html>
<head> <head>
<script type="text/javascript" src="js/components.js"></script> <script type="text/javascript" src="js/components.js"></script>
<script type="text/javascript" src="js/curve25519_compiled.js"></script>
<script type="text/javascript" src="js/nativeclient.js"></script>
<script type="text/javascript" src="js/webcrypto.js"></script>
<script type="text/javascript" src="js/libtextsecure.js"></script> <script type="text/javascript" src="js/libtextsecure.js"></script>
<script type="text/javascript" src="js/database.js"></script> <script type="text/javascript" src="js/database.js"></script>

4
index.html
View File

@@ -131,10 +131,6 @@
</script> </script>
<script type="text/javascript" src="js/components.js"></script> <script type="text/javascript" src="js/components.js"></script>
<script type="text/javascript" src="js/curve25519_compiled.js"></script>
<script type="text/javascript" src="js/nativeclient.js"></script>
<script type="text/javascript" src="js/webcrypto.js"></script>
<script type="text/javascript" src="js/libtextsecure.js"></script> <script type="text/javascript" src="js/libtextsecure.js"></script>
<script type="text/javascript" src="js/database.js"></script> <script type="text/javascript" src="js/database.js"></script>

2886
js/libtextsecure.js
View File

File diff suppressed because one or more lines are too long

0
js/curve25519_compiled.js → libtextsecure/curve25519_concat.js
View File

0
js/nativeclient.js → libtextsecure/nativeclient.js
View File

6
libtextsecure/test/index.html
View File

@@ -34,9 +34,9 @@
<script type="text/javascript" src="../components.js"></script> <script type="text/javascript" src="../components.js"></script>
<script type="text/javascript" src="../../js/curve25519_compiled.js"></script> <script type="text/javascript" src="../curve25519_concat.js"></script>
<script type="text/javascript" src="../../js/nativeclient.js"></script> <script type="text/javascript" src="../nativeclient.js"></script>
<script type="text/javascript" src="../../js/webcrypto.js"></script> <script type="text/javascript" src="../webcrypto_concat.js"></script>
<script type="text/javascript" src="../protobufs.js" data-cover></script> <script type="text/javascript" src="../protobufs.js" data-cover></script>
<script type="text/javascript" src="../websocket.js" data-cover></script> <script type="text/javascript" src="../websocket.js" data-cover></script>

0
js/webcrypto.js → libtextsecure/webcrypto_concat.js
View File

4
options.html
View File

@@ -96,10 +96,6 @@
</div> </div>
<script type="text/javascript" src="js/components.js"></script> <script type="text/javascript" src="js/components.js"></script>
<script type="text/javascript" src="js/curve25519_compiled.js"></script>
<script type="text/javascript" src="js/nativeclient.js"></script>
<script type="text/javascript" src="js/webcrypto.js"></script>
<script type="text/javascript" src="js/libtextsecure.js"></script> <script type="text/javascript" src="js/libtextsecure.js"></script>
<script type="text/javascript" src="js/database.js"></script> <script type="text/javascript" src="js/database.js"></script>

4
test/index.html
View File

@@ -125,10 +125,6 @@
<script type="text/javascript" src="../js/components.js"></script> <script type="text/javascript" src="../js/components.js"></script>
<script type="text/javascript" src="../js/curve25519_compiled.js"></script>
<script type="text/javascript" src="../js/nativeclient.js"></script>
<script type="text/javascript" src="../js/webcrypto.js"></script>
<script type="text/javascript" src="../js/libtextsecure.js"></script> <script type="text/javascript" src="../js/libtextsecure.js"></script>
<script type="text/javascript" src="../js/libphonenumber-util.js"></script> <script type="text/javascript" src="../js/libphonenumber-util.js"></script>