Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypt.c: Don't attempt to seed crypt_data.current_salt. #43

Merged
merged 1 commit into from
Sep 23, 2024
Merged

crypt.c: Don't attempt to seed crypt_data.current_salt. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -71,6 +71,6 @@ jobs:
make

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
51 changes: 39 additions & 12 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,39 @@ jobs:
runs-on: ubuntu-24.04
name: Ubuntu 24.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build LBBS
run: |
- name: Checkout
uses: actions/checkout@v4
- name: Build LBBS
run: |
sudo sed -i 's/azure\.//' /etc/apt/sources.list
sudo ./scripts/install_prereq.sh
sudo make modcheck
sudo make
sudo make install
sudo make samples
sudo make tests
- name: Run tests
run: |
- name: Run tests
run: |
sudo tests/test -ddddddddd -DDDDDDDDDD -x
sudo apt-get install -y valgrind
sudo tests/test -ddddddddd -DDDDDDDDDD -ex
ubuntu-stable:
runs-on: ubuntu-22.04
name: Ubuntu 22.04
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build LBBS
run: |
- name: Checkout
uses: actions/checkout@v4
- name: Build LBBS
run: |
sudo sed -i 's/azure\.//' /etc/apt/sources.list
sudo ./scripts/install_prereq.sh
sudo make modcheck
sudo make
sudo make install
sudo make samples
sudo make tests
- name: Run tests
run: |
- name: Run tests
run: |
sudo tests/test -ddddddddd -DDDDDDDDDD -x
sudo apt-get install -y valgrind
sudo tests/test -ddddddddd -DDDDDDDDDD -ex
Expand All @@ -64,6 +64,9 @@ jobs:
make install
make samples
make tests
- name: Run basic tests
run: |
tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
debian-11:
runs-on: ubuntu-24.04
name: Debian 11
Expand All @@ -78,6 +81,9 @@ jobs:
make install
make samples
make tests
- name: Run basic tests
run: |
tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
debian-10:
runs-on: ubuntu-24.04
name: Debian 10
Expand All @@ -92,6 +98,9 @@ jobs:
make install
make samples
make tests
- name: Run basic tests
run: |
tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
fedora-42:
runs-on: ubuntu-24.04
name: Fedora 42
Expand All @@ -107,6 +116,9 @@ jobs:
make install
make samples
make tests
- name: Run basic tests
run: |
tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
fedora-40:
runs-on: ubuntu-24.04
name: Fedora 40
Expand All @@ -122,6 +134,9 @@ jobs:
make install
make samples
make tests
- name: Run basic tests
run: |
tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
rocky-9:
runs-on: ubuntu-24.04
name: Rocky Linux 9.3
Expand All @@ -137,6 +152,9 @@ jobs:
make install
make samples
make tests
- name: Run basic tests
run: |
tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
rocky-8:
runs-on: ubuntu-24.04
name: Rocky Linux 8.9
Expand All @@ -152,6 +170,9 @@ jobs:
make install
make samples
make tests
- name: Run basic tests
run: |
tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
opensuse:
runs-on: ubuntu-24.04
name: openSUSE Tumbleweed
Expand All @@ -167,6 +188,9 @@ jobs:
make install
make samples
make tests
- name: Run basic tests
run: |
tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
archlinux:
runs-on: ubuntu-24.04
name: Arch Linux
Expand All @@ -182,6 +206,9 @@ jobs:
make install
make samples
make tests
- name: Run basic tests
run: |
tests/test -ttest_menus -ddddddddd -DDDDDDDDDD -x
freebsd-14:
runs-on: ubuntu-24.04
name: FreeBSD
Expand Down
7 changes: 6 additions & 1 deletion bbs/crypt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,13 @@ char *bbs_password_hash(const char *password, const char *salt)
#ifdef CRYPT_DEBUG
bbs_debug(9, "Using alternate crypt_r\n");
#endif /* CRYPT_DEBUG */
data.current_salt[0] = '$';
#if 0
/* XXX Modern documentation doesn't really discuss the purpose of this field or when you would want
* to seed the first two bytes like this, and I don't really remember why this was done now.
* Also, on some platforms these fields aren't available, so just disable this for now. */
data.current_salt[0] = '$'; /* See encrypt(3) */
data.current_salt[1] = '2';
#endif
hash = __crypt_r(password, salt, &data); /* Use our custom implementation of crypt_r */
#endif /* NEED_CRYPTO_IMPL */

Expand Down