Skip to content

Removed the version header from armored messages. #1113

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.

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

Merged
merged 2 commits into from
May 6, 2020
Merged
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion .github/workflows/centos7.yml
Original file line number Diff line number Diff line change
@@ -37,7 +37,12 @@ jobs:
RNP_TESTS: rnp_tests
env: ${{ matrix.env }}
steps:
- uses: actions/checkout@v1
- run: |
yum -y install http://opensource.wandisco.com/centos/7/git/x86_64/wandisco-git-release-7-2.noarch.rpm
yum -y install git
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Add rnpuser
run: |
useradd rnpuser
4 changes: 3 additions & 1 deletion .github/workflows/coverity.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,9 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 20
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup environment
run: |
. ci/gha/setup-env.inc.sh
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip ci')"
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
- uses: DoozyX/clang-format-lint-action@v0.5
with:
clangFormatVersion: 9
4 changes: 3 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,9 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip ci')"
timeout-minutes: 50
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup environment
run: |
. ci/gha/setup-env.inc.sh
4 changes: 3 additions & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,9 @@ jobs:
if: "!contains(github.event.head_commit.message, 'skip ci')"
timeout-minutes: 50
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup environment
run: |
. ci/gha/setup-env.inc.sh
4 changes: 3 additions & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,9 @@ jobs:
steps:
- name: Disable git eol translation
run: git config --global core.autocrlf false
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Add MSYS2 path
uses: MSP-Greg/msys2-action/add_paths@master
- name: Update MSYS2
5 changes: 0 additions & 5 deletions src/librepgp/stream-armor.cpp
Original file line number Diff line number Diff line change
@@ -937,11 +937,6 @@ init_armored_dst(pgp_dest_t *dst, pgp_dest_t *writedst, pgp_armored_msg_t msgtyp
/* armor header */
dst_write(writedst, hdr, strlen(hdr));
armor_write_eol(param);
/* version string */
strncpy(hdr, "Version: " PACKAGE_STRING, sizeof(hdr));
hdr[sizeof(hdr) - 1] = '\0';
dst_write(writedst, hdr, strlen(hdr));
armor_write_eol(param);
/* empty line */
armor_write_eol(param);