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

Dev Merge into Main #135

Merged
merged 44 commits into from
Nov 9, 2022
Merged

Dev Merge into Main #135

merged 44 commits into from
Nov 9, 2022

Conversation

rjbrown2
Copy link
Member

@rjbrown2 rjbrown2 commented Nov 8, 2022

Prepping to Tag for 1.1.1 release on our side.

rjbrown6 and others added 30 commits July 31, 2022 17:10
@rjbrown6
First Pass + Unit test for CBC - Needs to be moved still
7a22d6f
@rjbrown6
Refactoring, and starter unit tests for internal side. WIP: KMC template
8d99199
@rjbrown6
WIP: May have broken tests/logic
3647706
@rjbrown6
ENC/DEC Happy Paths working on both sides (KMC/GCrypt). TODO: Move un…
44c3bfb 
…it tests to own files, addl code cleanup
@rjbrown6
Moved unit Tests, Continuing more testing, CBC ready to be thoroughly…
cceb0dc 
… tested and fixed as necessary
@rjbrown6
KMC Side Unit Tests
376fbc5
@rjbrown6
Removing test that was moved from ut_tc_apply
06661fb
@zlynch2
Adding Unit Tests for CBC Mode
4e5c743
@rjbrown2
Update cryptography_interface_libgcrypt.template.c
b70003d 
Modifying unused variable errors.
@rjbrown6
Bug Fix for MDB Tests. Fixed MDB SA ACS reference
6e4c2bb
@rjbrown6
Merge Request Code Review Changes
7b13732
@rjbrown6
Code Review updates, and new MBD tests
4901578
@rjbrown2
Merge pull request #117 from nasa/AES_CBC_Encryption
ece7888 
CBC AES256 Addition
@rjbrown6
Added bug fix, and freed additional memory that should be being freed
e57ee60
@rjbrown6
Removed duplicated code
c2e8e04
@rjbrown6
Fixing for ak_ref as well
e503bcc
@rjbrown6
Fix memory leak, unnecessary return
9a34046
@rjbrown6
Slight refactor, and more memory leak cleanup
d3bc59f
@rjbrown2
Merge pull request #119 from nasa/118-bug-fix-sadb_routine_mariadbtem…
473bf5f 
…platec

Added bug fix, and freed additional memory that should be being freed
@rjbrown6
Auth Only, Auth Enc, Auth Dec, Baseline
0c8a8ee
@rjbrown6
Adding SA[10] back in for performance tests
2010684
@rjbrown2
Merge pull request #122 from nasa/121-performance-tests
6f00cc3 
121 performance tests
@rjbrown6
Start of code cleanup. More to come
4a5c989
@rjbrown6
Merge branch '123-code-cleanup' of github.com:nasa/CryptoLib into 123…
569c596 
…-code-cleanup
@rjbrown2
Merge pull request #124 from nasa/123-code-cleanup
beea285 
123 code cleanup
@rjbrown6
UT_MDB updates for leaks
23e117a
@rjbrown6
Final Leak Fixes
77832ff
@rjbrown6
Remove old test file
fba2016
@IbraheemYSaleh
AMMOSGH-96: Add initial CAM pre-authenticated cookiefile support
65f5d40
@IbraheemYSaleh
AMMOSGH-104: Add CryptoLib Error-Code to Enum String Functionality fo…
c2f184b 
…r use in downstream applications
IbraheemYSaleh and others added 14 commits August 30, 2022 18:00
@IbraheemYSaleh
AMMOSGH-96:Update Crypto_Config_Cam function to support future args r…
2abd087 
…equired for Kerberos/keytab login methods
@rjbrown2
Merge pull request #125 from nasa/AMMOSGH-96
913134f 
AMMOSGH-96: Add Initial CAM support with pre-authenticated cookiefile
@rjbrown6
Merge Conflicts Fixed
a367af9
@IbraheemYSaleh
AMMOSGH-17:Set Unique Index to SPI+SCID, not SPI+GVCID
55cde5b
@rjbrown6
PR Modifications
fd9bbec
@rjbrown2
Merge pull request #126 from nasa/123-code-cleanup
3ba194d 
123 code cleanup
@rjbrown2
Merge pull request #127 from nasa/AMMOSGH-17
8004282 
AMMOSGH-17 Make SPI + SCID the Primary Key
@IbraheemYSaleh
AMMOSGH-115: Added implementation for Kerberos and Keytab File based …
a7c88dc 
…login methods for CAM support
@IbraheemYSaleh
AMMOSGH-115: Fix CAM authentication retry logic,add error conditions,…
e27a5f3 
… add missing frees
@IbraheemYSaleh
Merge pull request #130 from nasa/AMMOSGH-115
5340fdf 
AMMOSGH-115: Added implementation for Kerberos and Keytab File based …
@IbraheemYSaleh
AMMOSGH-115: Fix malloc bug found by KMC java tests
ac7162b
@IbraheemYSaleh
Merge pull request #131 from nasa/AMMOSGH-115-pt2
d9ac54a 
AMMOSGH-115: Fix malloc bug found by KMC java tests
@IbraheemYSaleh
AMMOSGH-121: Make verbose outputs only print in DEBUG builds
6a0110d
@IbraheemYSaleh
Merge pull request #132 from nasa/AMMOSGH-121
0893c89 
AMMOSGH-121: Make verbose outputs only print in DEBUG builds
@jlucas9
Copy link
Collaborator

jlucas9 commented Nov 8, 2022

I don't see a version number either. Let's merge it!

IbraheemYSaleh
IbraheemYSaleh approved these changes Nov 9, 2022
View reviewed changes
Copy link
Contributor

@IbraheemYSaleh IbraheemYSaleh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be good to merge -- each dev feature was individually reviewed.

@rjbrown2 rjbrown2 merged commit 72f4ff5 into main Nov 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IbraheemYSaleh IbraheemYSaleh IbraheemYSaleh approved these changes

@jlucas9 jlucas9 Awaiting requested review from jlucas9

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rjbrown2 @jlucas9 @IbraheemYSaleh @rjbrown6 @zlynch2