Skip to content

Commit 5dadca4

Browse files
authored
Merge pull request #290 from nasa/287-consider-open-source-code-scanner-extensions-and-update-codecov
287 consider open source code scanner extensions and update codecov
2 parents 668efc3 + 31bf6eb commit 5dadca4

File tree

2 files changed

+107
-5
lines changed

2 files changed

+107
-5
lines changed

.github/workflows/codeql.yml

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL Advanced"
13+
14+
on:
15+
pull_request:
16+
branches: [ main, dev ]
17+
18+
jobs:
19+
analyze:
20+
name: Analyze (${{ matrix.language }})
21+
# Runner size impacts CodeQL analysis time. To learn more, please see:
22+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
23+
# - https://gh.io/supported-runners-and-hardware-resources
24+
# - https://gh.io/using-larger-runners (github.com only)
25+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
26+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
27+
permissions:
28+
# required for all workflows
29+
security-events: write
30+
31+
# required to fetch internal or private CodeQL packs
32+
packages: read
33+
34+
# only required for workflows in private repositories
35+
actions: read
36+
contents: read
37+
38+
strategy:
39+
fail-fast: false
40+
matrix:
41+
include:
42+
- language: c-cpp
43+
build-mode: manual
44+
- language: python
45+
build-mode: none
46+
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
47+
# Use `c-cpp` to analyze code written in C, C++ or both
48+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
49+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
50+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
51+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
52+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
53+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
54+
steps:
55+
- name: Checkout repository
56+
uses: actions/checkout@v4
57+
58+
# Initializes the CodeQL tools for scanning.
59+
- name: Initialize CodeQL
60+
uses: github/codeql-action/init@v3
61+
with:
62+
languages: ${{ matrix.language }}
63+
build-mode: ${{ matrix.build-mode }}
64+
# If you wish to specify custom queries, you can do so here or in a config file.
65+
# By default, queries listed here will override any specified in a config file.
66+
# Prefix the list here with "+" to use these queries and those in the config file.
67+
68+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
69+
# queries: security-extended,security-and-quality
70+
71+
# If the analyze step fails for one of the languages you are analyzing with
72+
# "We were unable to automatically build your code", modify the matrix above
73+
# to set the build mode to "manual" for that language. Then modify this step
74+
# to build your code.
75+
# ℹ️ Command-line programs to run using the OS shell.
76+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
77+
- if: matrix.build-mode == 'manual'
78+
shell: bash
79+
run: |
80+
sudo apt-get install -y lcov libcurl4-openssl-dev libmariadb-dev libmariadb-dev-compat python3
81+
sudo pip install pycryptodome
82+
curl \
83+
-LS https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.50.tar.bz2 \
84+
-o /tmp/libgpg-error-1.50.tar.bz2 \
85+
&& tar -xjf /tmp/libgpg-error-1.50.tar.bz2 -C /tmp/ \
86+
&& cd /tmp/libgpg-error-1.50 \
87+
&& sudo ./configure \
88+
&& sudo make install \
89+
&& curl \
90+
-LS https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.11.0.tar.bz2 \
91+
-o /tmp/libgcrypt-1.11.0.tar.bz2 \
92+
&& tar -xjf /tmp/libgcrypt-1.11.0.tar.bz2 -C /tmp/ \
93+
&& cd /tmp/libgcrypt-1.11.0 \
94+
&& sudo ./configure \
95+
&& sudo make install \
96+
&& sudo ldconfig
97+
bash ${GITHUB_WORKSPACE}/support/scripts/build_internal.sh
98+
99+
- name: Perform CodeQL Analysis
100+
uses: github/codeql-action/analyze@v3
101+
with:
102+
category: "/language:${{matrix.language}}"

src/sa/internal/sa_interface_inmemory.template.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -903,31 +903,31 @@ int32_t sa_get_operational_sa_from_gvcid_generate_error(int32_t* status, uint8_t
903903
// ordering so the 'most accurate' SA's error is returned
904904
// (determined by matching header fields L to R)
905905
sa_mismatched_tfvn_error(&i, status, tfvn, scid, vcid, mapid);
906-
if(status != CRYPTO_LIB_SUCCESS)
906+
if(*status != CRYPTO_LIB_SUCCESS)
907907
{
908908
sa_debug_block(tfvn, scid, vcid, mapid);
909909
return *status;
910910
}
911911
sa_mismatched_scid(&i, status, tfvn, scid, vcid, mapid);
912-
if(status != CRYPTO_LIB_SUCCESS)
912+
if(*status != CRYPTO_LIB_SUCCESS)
913913
{
914914
sa_debug_block(tfvn, scid, vcid, mapid);
915915
return *status;
916916
}
917917
sa_mismatched_vcid(&i, status, tfvn, scid, vcid, mapid);
918-
if(status != CRYPTO_LIB_SUCCESS)
918+
if(*status != CRYPTO_LIB_SUCCESS)
919919
{
920920
sa_debug_block(tfvn, scid, vcid, mapid);
921921
return *status;
922922
}
923923
sa_mismatched_mapid(&i, status, tfvn, scid, vcid, mapid);
924-
if(status != CRYPTO_LIB_SUCCESS)
924+
if(*status != CRYPTO_LIB_SUCCESS)
925925
{
926926
sa_debug_block(tfvn, scid, vcid, mapid);
927927
return *status;
928928
}
929929
sa_non_operational_sa(&i, status, tfvn, scid, vcid, mapid);
930-
if(status != CRYPTO_LIB_SUCCESS)
930+
if(*status != CRYPTO_LIB_SUCCESS)
931931
{
932932
sa_debug_block(tfvn, scid, vcid, mapid);
933933
return *status;

0 commit comments

Comments
 (0)