Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kelektiv/node.bcrypt.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 054cf76ba6e2127560ed897d00b5b88d11dc5626
Choose a base ref
...
head repository: kelektiv/node.bcrypt.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f124bd84181ae2166232566c6c3fa116f28f7a6
Choose a head ref

Commits on Sep 7, 2017

  1. fix typo: compilant => compliant

    Bohdan Levantovych committed Sep 7, 2017
    Copy the full SHA
    5fbc8ec View commit details

Commits on Sep 14, 2017

  1. Merge pull request #542 from bodya17/master

    fix typo: compilant => compliant
    recrsn authored Sep 14, 2017
    Copy the full SHA
    7d53afa View commit details
  2. Copy the full SHA
    6746a04 View commit details
  3. Copy the full SHA
    ebb7417 View commit details
  4. Copy the full SHA
    f3a34bd View commit details

Commits on Sep 23, 2017

  1. Merge pull request #545 from agathver/test-improvements

    Improve test cases
    ncb000gt authored Sep 23, 2017
    Copy the full SHA
    7914916 View commit details
  2. Merge pull request #539 from tonylukasavage/issue-538

    preserve stack traces on async error callbacks
    ncb000gt authored Sep 23, 2017
    Copy the full SHA
    99e2a09 View commit details

Commits on Oct 1, 2017

  1. Remove support for NodeJS < 4

    Closes #529
    recrsn committed Oct 1, 2017
    Copy the full SHA
    9540ed0 View commit details

Commits on Oct 5, 2017

  1. Copy the full SHA
    148db49 View commit details
  2. Copy the full SHA
    e122796 View commit details
  3. Copy the full SHA
    c9ec383 View commit details

Commits on Oct 6, 2017

  1. Copy the full SHA
    fead6b3 View commit details
  2. Copy the full SHA
    11378bc View commit details

Commits on Oct 7, 2017

  1. Copy the full SHA
    e0d0b12 View commit details

Commits on Oct 8, 2017

  1. Copy the full SHA
    92c538e View commit details
  2. Copy the full SHA
    efae084 View commit details

Commits on Oct 9, 2017

  1. Copy the full SHA
    b5c786e View commit details
  2. Copy the full SHA
    ed9ddef View commit details
  3. Removed namespace

    NickNaso committed Oct 9, 2017
    Copy the full SHA
    dbd032f View commit details
  4. Removed some bad code

    NickNaso committed Oct 9, 2017
    Copy the full SHA
    9c85bb0 View commit details

Commits on Oct 12, 2017

  1. Copy the full SHA
    b03a6e4 View commit details

Commits on Oct 13, 2017

  1. Copy the full SHA
    93ebfb3 View commit details

Commits on Oct 15, 2017

  1. Removed bindings

    NickNaso committed Oct 15, 2017
    Copy the full SHA
    f4e4555 View commit details
  2. Copy the full SHA
    bf07c28 View commit details

Commits on Oct 17, 2017

  1. Copy the full SHA
    17d7d6d View commit details
  2. Copy the full SHA
    b19ba70 View commit details

Commits on Oct 19, 2017

  1. Copy the full SHA
    572f724 View commit details
  2. Copy the full SHA
    62c7f29 View commit details
  3. Copy the full SHA
    dca5076 View commit details

Commits on Oct 20, 2017

  1. Update travis config

    NickNaso committed Oct 20, 2017
    Copy the full SHA
    48efe78 View commit details
  2. Copy the full SHA
    7559cba View commit details

Commits on Oct 21, 2017

  1. Merge pull request #550 from agathver/drop-old-node

    Remove support for NodeJS < 4
    recrsn authored Oct 21, 2017
    Copy the full SHA
    90d438b View commit details

Commits on Nov 1, 2017

  1. Add NodeJS 9 to CI matrix

    recrsn committed Nov 1, 2017
    Copy the full SHA
    7b928fb View commit details

Commits on Nov 21, 2017

  1. Copy the full SHA
    72c1a3b View commit details
  2. Add NodeJS 9 to CI

    NickNaso committed Nov 21, 2017
    Copy the full SHA
    5467983 View commit details
  3. remove node 9 from appveyor

    NickNaso committed Nov 21, 2017
    Copy the full SHA
    039b7ec View commit details

Commits on Nov 22, 2017

  1. Added on the contributors

    NickNaso committed Nov 22, 2017
    Copy the full SHA
    f670313 View commit details
  2. Copy the full SHA
    5cda155 View commit details

Commits on Nov 28, 2017

  1. Copy the full SHA
    30c8dc7 View commit details

Commits on Dec 8, 2017

  1. Bump deps

    recrsn committed Dec 8, 2017
    Copy the full SHA
    d1cb91d View commit details
  2. Merge pull request #554 from agathver/node-9

    Add NodeJS 9 to CI matrix
    recrsn authored Dec 8, 2017
    Copy the full SHA
    096a34f View commit details

Commits on Dec 12, 2017

  1. Merge pull request #551 from NickNaso/node-addon-api

    bcrypt for Node.js with Node addon api
    recrsn authored Dec 12, 2017
    Copy the full SHA
    3edea5f View commit details

Commits on Dec 21, 2017

  1. README: comparisons resist timing attacks

    Clarify in README that the comparisons resist timing attacks.
    
    This fixes issue #563.
    david-a-wheeler authored Dec 21, 2017
    Copy the full SHA
    f2bec20 View commit details

Commits on Dec 29, 2017

  1. Merge pull request #564 from david-a-wheeler/readme-timing

    README: comparisons resist timing attacks
    recrsn authored Dec 29, 2017
    Copy the full SHA
    43734e3 View commit details

Commits on Jan 21, 2018

  1. Copy the full SHA
    4611940 View commit details
  2. v1.1.0-napi

    recrsn committed Jan 21, 2018
    Copy the full SHA
    b1de58e View commit details

Commits on Feb 19, 2018

  1. Copy the full SHA
    89e34ac View commit details

Commits on Mar 11, 2018

  1. fix: package.json to reduce vulnerabilities

    The following vulnerabilities are fixed with an upgrade:
    - https://snyk.io/vuln/npm:hoek:20180212
    
    Latest report for kelektiv/node.bcrypt.js:
    https://snyk.io/test/github/kelektiv/node.bcrypt.js
    snyk-bot committed Mar 11, 2018
    Copy the full SHA
    1da0f44 View commit details

Commits on Mar 15, 2018

  1. Merge pull request #584 from kelektiv/snyk-fix-bc668290

    [Snyk Update] New fixes for 8 vulnerable dependency paths
    recrsn authored Mar 15, 2018
    Copy the full SHA
    88590ea View commit details
  2. fix: propagate async context

    Starting with Nan 2.9.0, we have the ability to propagate async context
    across async hops. Certain variants of Nan::Callback::Call are now
    deprecated to encourage context preserving.
    
    Here's a simple patch that fixes the deprecation warnings and properly
    propagates the async context across the async APIs exposed by this
    module.
    
    For more information see [1], [2].
    
    [1]: https://github.com/nodejs/nan/blob/HEAD/doc/node_misc.md#nanasyncresource.
    [2]: https://nodejs.org/dist/latest-v9.x/docs/api/async_hooks.html#async_hooks_javascript_embedder_api
    ofrobots committed Mar 15, 2018
    Copy the full SHA
    6a79eaf View commit details
Showing with 5,997 additions and 557 deletions.
  1. +19 −0 .editorconfig
  2. +1 −1 .gitignore
  3. +46 −23 .travis.yml
  4. +83 −0 CHANGELOG.md
  5. +131 −40 README.md
  6. +15 −0 SECURITY.md
  7. +21 −22 appveyor.yml
  8. +59 −27 bcrypt.js
  9. +26 −2 binding.gyp
  10. +5,089 −0 package-lock.json
  11. +14 −8 package.json
  12. +9 −13 {lib → }/promises.js
  13. +47 −54 src/bcrypt.cc
  14. +226 −293 src/bcrypt_node.cc
  15. +0 −7 src/blowfish.cc
  16. +25 −4 src/node_blf.h
  17. +36 −16 test/async.js
  18. +53 −0 test/implementation.js
  19. +53 −21 test/promise.js
  20. +32 −16 test/sync.js
  21. +12 −0 test_alpine.sh
  22. +0 −10 werker.yml
19 changes: 19 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[{package.json,*.yml}]
indent_style = space
indent_size = 2

[appveyor.yml]
end_of_line = crlf

[*.md]
trim_trailing_whitespace = false
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.lock*
build
build*
*.node
*.sw[a-z]
node_modules
69 changes: 46 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,40 +1,63 @@
language: node_js

services:
- docker

env:
- LINUX_CXX=g++-4.8
- LINUX_CXX=g++-4.8

os:
- linux
- osx
- linux
- osx

arch:
- amd64
- arm64

node_js:
- "0.8"
- "0.10"
- "0.12"
- "4"
- "5"
- "6"
- "7"
- "8"
- '10'
- '11'
- '12'
- '13'
- '14'
- '15'

addons:
apt:
sources:
- ubuntu-toolchain-r-test
- ubuntu-toolchain-r-test
packages:
- g++-4.8
- bc
- g++-4.8
- bc

before_install:
- echo Building for Node $TRAVIS_NODE_VERSION
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=$LINUX_CXX; $CXX --version; fi;
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then c++ --version; fi;
- if [[ $(echo "$TRAVIS_NODE_VERSION <= 0.12" | bc -l) ]]; then npm install -g npm@2; else npm install -g npm@latest; fi;
- echo Building for Node $TRAVIS_NODE_VERSION
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX=$LINUX_CXX; $CXX --version;
fi;
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then c++ --version; fi;
- npm install -g npm@latest

install: true

script: npm test

after_success:
- REGEX='^v(0|[1-9]+)\.(0|[1-9]+)\.(0|[1-9]+)$'
- if [[ $TRAVIS_TAG =~ $REGEX ]] || [[ $TRAVIS_COMMIT_MESSAGE == *"publish binary"* ]]; then echo "Publishing"; npm install node-pre-gyp-github; ./node_modules/.bin/node-pre-gyp configure; ./node_modules/.bin/node-pre-gyp build; ./node_modules/.bin/node-pre-gyp package; ./node_modules/.bin/node-pre-gyp-github publish --release; fi;
script:
- npm test
- "./node_modules/.bin/node-pre-gyp configure"
- "./node_modules/.bin/node-pre-gyp build"
- "./node_modules/.bin/node-pre-gyp package"
- |
if [[ "$TRAVIS_OS_NAME" == "linux" ]]
then
docker run -w /src --entrypoint /bin/sh -v`pwd`:/src "node:${TRAVIS_NODE_VERSION}-alpine" test_alpine.sh
fi
deploy:
provider: releases
skip_cleanup: true
api_key:
secure: j4gQ+m02izaw56EOd0gEStHAjCRfSCkohDWvpABiPzh1YPM9MvfEMSIvzzjV/0oMqi3Sy7eGyFv47EgQHZvouW0I8BIUzxuTCE5wP8z2SjABXCa/rz4WTppTc9d9ABq8JSdz80JxEwjmuwnYeMwWgOd7sT/VDiMxLYaXj0JWO7w=
file_glob: true
file: build/stage/kelektiv/node.bcrypt.js/releases/download/*/*
on:
node_js: '10'
repo: kelektiv/node.bcrypt.js
tags: true
83 changes: 83 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,86 @@
# 5.0.1 (2021-02-22)

* Update `node-pre-gyp` to 1.0.0

# 5.0.0 (2020-06-02)

* Fix the bcrypt "wrap-around" bug. It affects passwords with lengths >= 255.
It is uncommon but it's a bug nevertheless. Previous attempts to fix the bug
was unsuccessful.
* Experimental support for z/OS
* Fix a bug related to NUL in password input
* Update `node-pre-gyp` to 0.15.0

# 4.0.1 (2020-02-27)

* Fix compilation errors in Alpine linux

# 4.0.0 (2020-02-17)

* Switch to NAPI bcrypt
* Drop support for NodeJS 8

# 3.0.8 (2019-12-31)

* Update `node-pre-gyp` to 0.14
* Pre-built binaries for NodeJS 13

# 3.0.7 (2019-10-18)

* Update `nan` to 2.14.0
* Update `node-pre-gyp` to 0.13

# 3.0.6 (2019-04-11)

* Update `nan` to 2.13.2

# 3.0.5 (2019-03-19)

* Update `nan` to 2.13.1
* NodeJS 12 compatibility
* Remove `node-pre-gyp` from bundled dependencies

# 3.0.4-napi (2019-03-08)

* Sync N-API bcrypt with NAN bcrypt

# 3.0.4 (2019-02-07)

* Fix GCC, NAN and V8 deprecation warnings

# 3.0.3 (2018-12-19)

* Update `nan` to 2.12.1

# 3.0.2 (2018-10-18)

* Update `nan` to 2.11.1

# 3.0.1 (2018-09-20)

* Update `nan` to 2.11.0

# 3.0.0 (2018-07-06)

* Drop support for NodeJS <= 4

# 2.0.1 (2018-04-20)

* Update `node-pre-gyp` to allow downloading prebuilt modules

# 2.0.0 (2018-04-07)

* Make `2b` the default bcrypt version

# 1.1.0-napi (2018-01-21)

* Initial support for [N-API](https://nodejs.org/api/n-api.html)

# 1.0.3 (2016-08-23)

* update to nan v2.6.2 for NodeJS 8 support
* Fix: use npm scripts instead of node-gyp directly.

# 1.0.2 (2016-12-31)

* Fix `compare` promise rejection with invalid arguments
Loading