Merge pull request #244 from aidangarske/openssh-osp-fix

Add openssh V_9_9_P1 patch and newest Openssh V_10_0_P2

Author: douzzer

wolfProvider/openssh/README.md

@@ -1 +1,3 @@
 This patch is only needed for the full openssh test suite to run with wolfProvider.
+For V_9_9_P1 testing use the patch `openssh-V_9_9_P1-wolfprov.patch`
+For V_10_0_P2 testing use the patch `openssh-V_10_0_P2-wolfprov.patch`

…er/openssh/openssh-9.9.p1-wolfprov.patch …openssh/openssh-V_10_0_P2-wolfprov.patchwolfProvider/openssh/openssh-9.9.p1-wolfprov.patch renamed to wolfProvider/openssh/openssh-V_10_0_P2-wolfprov.patch wolfProvider/openssh/openssh-9.9.p1-wolfprov.patch renamed to wolfProvider/openssh/openssh-V_10_0_P2-wolfprov.patch

@@ -4,9 +4,9 @@ index 8fe9276c2..f9a1b5fd2 100644
 +++ b/myproposal.h
 @@ -59,7 +59,6 @@
  	"rsa-sha2-256"
- 
+
  #define	KEX_SERVER_ENCRYPT \
 -	"chacha20-poly1305@openssh.com," \
  	"aes128-gcm@openssh.com,aes256-gcm@openssh.com," \
  	"aes128-ctr,aes192-ctr,aes256-ctr"
- 
+

wolfProvider/openssh/openssh-V_9_9_P1-wolfprov.patch

@@ -0,0 +1,12 @@
+diff --git a/myproposal.h b/myproposal.h
+index 3bdc2e955..c720af88e 100644
+--- a/myproposal.h
++++ b/myproposal.h
+@@ -59,7 +59,6 @@
+ 	"rsa-sha2-256"
+
+ #define	KEX_SERVER_ENCRYPT \
+-	"chacha20-poly1305@openssh.com," \
+ 	"aes128-ctr,aes192-ctr,aes256-ctr," \
+ 	"aes128-gcm@openssh.com,aes256-gcm@openssh.com"
+

wolfProvider/stunnel/README.md

@@ -3,4 +3,4 @@ environment variable, which is used to simulate provider failures during
 testing. It is only needed if you are testing wolfProvider with
 `WOLFPROV_FORCE_FAIL=1`.
 The patch includes modifications to certificate generation and session
-resumption tests to properly handle this test mode.
+resumption tests to properly handle this test mode.