[Pkg-javascript-commits] [node-cipher-base] 06/13: Merge pull request #8 from crypto-browserify/safebuf

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-cipher-base.

commit ec4c050a205d696032c8c1d0eca39699e1e829aa
Merge: 11e46ea 9345e1d
Author: Daniel Cousens <dcousens at users.noreply.github.com>
Date:   Thu Jul 6 18:28:02 2017 +1000

    Merge pull request #8 from crypto-browserify/safebuf
    
    Safe Buffer & License

 .gitignore             |  1 +
 LICENSE                | 21 +++++++++++++++++++++
 readme.md => README.md |  0
 index.js               | 31 ++++++++++++++++++-------------
 package.json           |  4 +++-
 test.js                | 17 ++++++++++-------
 6 files changed, 53 insertions(+), 21 deletions(-)

diff --cc index.js
index a6fe528,13bed28..9441800
--- a/index.js
+++ b/index.js
@@@ -63,15 -61,15 +65,15 @@@ CipherBase.prototype._transform = funct
  CipherBase.prototype._flush = function (done) {
    var err
    try {
 -    this.push(this._final())
 +    this.push(this.__final())
    } catch (e) {
      err = e
-   } finally {
-     done(err)
    }
+ 
+   done(err)
  }
  CipherBase.prototype._finalOrDigest = function (outputEnc) {
 -  var outData = this._final() || new Buffer('')
 +  var outData = this.__final() || new Buffer('')
    if (outputEnc) {
      outData = this._toString(outData, outputEnc, true)
    }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-cipher-base.git