diff options
| author | Guillaume Horel <guillaume.horel@gmail.com> | 2011-06-22 00:38:02 -0400 |
|---|---|---|
| committer | Guillaume Horel <guillaume.horel@gmail.com> | 2011-06-22 00:38:02 -0400 |
| commit | 67ac29115c84b447d0fddef406ba591691d069ef (patch) | |
| tree | 3b5117226639501c1254e79331480183fc87aaf0 /webclient/lib | |
| parent | 571b3ce7234551b02bb8deca36b81177a5e256d3 (diff) | |
| download | alias-67ac29115c84b447d0fddef406ba591691d069ef.tar.gz | |
Added script to generate object
Proof of concept almost ready!
Diffstat (limited to 'webclient/lib')
| -rw-r--r-- | webclient/lib/LICENSE | 19 | ||||
| -rw-r--r-- | webclient/lib/alias.js | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/webclient/lib/LICENSE b/webclient/lib/LICENSE deleted file mode 100644 index 06d6642..0000000 --- a/webclient/lib/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2006-2009 Collecta, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/webclient/lib/alias.js b/webclient/lib/alias.js index 8c4224a..c87e7dd 100644 --- a/webclient/lib/alias.js +++ b/webclient/lib/alias.js @@ -171,7 +171,7 @@ var Alias = { var encryptedKey = query.find('key').text(); var key = this.rsa.decrypt(encryptedKey); var encryptedContent = query.find('content').text(); - var content = sjcl.decrypt(key, encryptedContent); + var content = sjcl.decrypt(sjcl.codec.base64.toBits(key), encryptedContent); $('#profile').html(content); }, |
