Skip to content

Commit

Permalink
Don't convert Windows newlines to Unix in SHA-256 code.
Browse files Browse the repository at this point in the history
Add license for SHA-256 code to LICENSE.txt.
  • Loading branch information
glasser committed Oct 10, 2012
1 parent a4639df commit f63daf3
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 2 deletions.
32 changes: 32 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,38 @@ All redistributions must retain an intact copy of this copyright notice
and disclaimer.


----------
jsSHA2: http://anmar.eu.org/projects/jssha2/
with Unicode support (Utf8Encode function) added by
http://www.webtoolkit.info/javascript-sha256.html
----------

Copyright (c) 2003-2004, Angel Marin
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.
* Neither the name of the <ORGANIZATION> nor the names of its contributors may
be used to endorse or promote products derived from this software without
specific prior written permission.

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 OWNER 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.



=============
Expand Down
11 changes: 9 additions & 2 deletions packages/srp/sha256.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ Meteor._srp.SHA256 = (function () {
/**
*
* Secure Hash Algorithm (SHA256)
* http://www.webtoolkit.info/
* http://www.webtoolkit.info/javascript-sha256.html
* http://anmar.eu.org/projects/jssha2/
*
* Original code by Angel Marin, Paul Johnston.
*
Expand Down Expand Up @@ -95,7 +96,13 @@ function SHA256(s){
}

function Utf8Encode(string) {
string = string.replace(/\r\n/g,"\n");
// METEOR change:
// The webtoolkit.info version of this code added this
// Utf8Encode function (which does seem necessary for dealing
// with arbitrary Unicode), but the following line seems
// problematic:
//
// string = string.replace(/\r\n/g,"\n");
var utftext = "";

for (var n = 0; n < string.length; n++) {
Expand Down

0 comments on commit f63daf3

Please sign in to comment.