Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
7cde1563
Commit
7cde1563
authored
1 year ago
by
Deucе
Browse files
Options
Downloads
Patches
Plain Diff
Fix warnings caused by our patches.
parent
35da527b
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#5725
passed
1 year ago
Stage: build
Stage: test
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
3rdp/build/cl-make-channels-work.patch
+59
-41
59 additions, 41 deletions
3rdp/build/cl-make-channels-work.patch
with
59 additions
and
41 deletions
3rdp/build/cl-make-channels-work.patch
+
59
−
41
View file @
7cde1563
--- ./session/ssh.h.orig 2023-05-06 18:55:50.000000000 -0400
+++ ./session/ssh.h 2024-01-12 23:35:03.804841000 -0500
@@ -309,9 +309,17 @@
SSH_ATTRIBUTE_WINDOWCOUNT, /* Data window count */
SSH_ATTRIBUTE_WINDOWSIZE, /* Data window size */
SSH_ATTRIBUTE_ALTCHANNELNO, /* Secondary channel no. */
+ SSH_ATTRIBUTE_NEEDWINDOW, /* Send session open when window opens */
SSH_ATTRIBUTE_LAST /* Last channel attribute */
} SSH_ATTRIBUTE_TYPE;
+#ifdef USE_SSH_EXTENDED
+typedef enum { SERVICE_NONE, SERVICE_SHELL, SERVICE_PORTFORWARD,
+ SERVICE_SUBSYSTEM, SERVICE_EXEC, SERVICE_LAST } SERVICE_TYPE;
+#else
+typedef enum { SERVICE_NONE, SERVICE_SHELL, SERVICE_LAST } SERVICE_TYPE;
+#endif /* USE_SSH_EXTENDED */
+
/* Check whether a DH/ECDH value is valid for a given server key size. The
check is slightly different for the ECC version because the value is
a composite ECC point with two coordinates, so we have to divide the
@@ -697,6 +705,18 @@
/* Prototypes for functions in ssh2_msgcli.c */
+CHECK_RETVAL STDC_NONNULL_ARG( ( 1, 2 ) ) \
+int getServiceType( INOUT_PTR SESSION_INFO *sessionInfoPtr,
+ OUT_ENUM_OPT( SERVICE ) SERVICE_TYPE *serviceType );
+ CHECK_RETVAL STDC_NONNULL_ARG( ( 1, 2 ) ) \
+int createSessionOpenRequest( INOUT_PTR SESSION_INFO *sessionInfoPtr,
+ INOUT_PTR STREAM *stream,
+ IN_ENUM( SERVICE ) \
+ const SERVICE_TYPE serviceType );
+CHECK_RETVAL STDC_NONNULL_ARG( ( 1, 2 ) ) \
+int processChannelOpenFailure( INOUT_PTR SESSION_INFO *sessionInfoPtr, INOUT_PTR STREAM *stream );
+CHECK_RETVAL STDC_NONNULL_ARG( ( 1, 2 ) ) \
+int processChannelOpenConfirmation( INOUT_PTR SESSION_INFO *sessionInfoPtr, INOUT_PTR STREAM *stream );
CHECK_RETVAL STDC_NONNULL_ARG( ( 1 ) ) \
int sendChannelOpen( INOUT_PTR SESSION_INFO *sessionInfoPtr );
--- session/sess_rd.c.orig 2023-05-06 19:14:10.000000000 -0400
+++ session/sess_rd.c 2024-01-13 01:40:38.360167000 -0500
@@ -739,7 +739,7 @@
...
...
@@ -523,8 +484,8 @@
+ return (CRYPT_ENVELOPE_RESOURCE);
}
#endif /* USE_SSH */
--- session/ssh2_channel.c.orig 2024-0
1-14 18:43:50.796652
000 -0500
+++ session/ssh2_channel.c 2024-0
1-14 18:45:50.515008
000 -0500
--- session/ssh2_channel.c.orig 2024-0
2-09 21:30:28.116630
000 -0500
+++ session/ssh2_channel.c 2024-0
2-09 21:31:00.238043
000 -0500
@@ -25,6 +25,7 @@
#define CHANNEL_FLAG_ACTIVE 0x01 /* Channel is active */
#define CHANNEL_FLAG_WRITECLOSED 0x02 /* Write-side of ch.closed */
...
...
@@ -553,6 +514,15 @@
}
retIntError();
@@ -726,7 +731,7 @@
}
CHECK_RETVAL STDC_NONNULL_ARG( ( 1 ) ) \
-int setChannelExtAttribute( const SESSION_INFO *sessionInfoPtr,
+int setChannelExtAttribute( INOUT_PTR SESSION_INFO *sessionInfoPtr,
IN_ATTRIBUTE const SSH_ATTRIBUTE_TYPE attribute,
IN_INT_Z const int value )
{
@@ -748,6 +753,8 @@
{
case SSH_ATTRIBUTE_ACTIVE:
...
...
@@ -576,3 +546,51 @@
return( CRYPT_OK );
}
--- session/ssh.h.orig 2023-05-06 18:55:50.000000000 -0400
+++ session/ssh.h 2024-02-09 21:31:35.603926000 -0500
@@ -309,9 +309,17 @@
SSH_ATTRIBUTE_WINDOWCOUNT, /* Data window count */
SSH_ATTRIBUTE_WINDOWSIZE, /* Data window size */
SSH_ATTRIBUTE_ALTCHANNELNO, /* Secondary channel no. */
+ SSH_ATTRIBUTE_NEEDWINDOW, /* Send session open when window opens */
SSH_ATTRIBUTE_LAST /* Last channel attribute */
} SSH_ATTRIBUTE_TYPE;
+#ifdef USE_SSH_EXTENDED
+typedef enum { SERVICE_NONE, SERVICE_SHELL, SERVICE_PORTFORWARD,
+ SERVICE_SUBSYSTEM, SERVICE_EXEC, SERVICE_LAST } SERVICE_TYPE;
+#else
+typedef enum { SERVICE_NONE, SERVICE_SHELL, SERVICE_LAST } SERVICE_TYPE;
+#endif /* USE_SSH_EXTENDED */
+
/* Check whether a DH/ECDH value is valid for a given server key size. The
check is slightly different for the ECC version because the value is
a composite ECC point with two coordinates, so we have to divide the
@@ -655,7 +663,7 @@
IN_BUFFER( dataLength ) const void *data,
IN_LENGTH_TEXT const int dataLength );
CHECK_RETVAL STDC_NONNULL_ARG( ( 1 ) ) \
-int setChannelExtAttribute( const SESSION_INFO *sessionInfoPtr,
+int setChannelExtAttribute( INOUT_PTR SESSION_INFO *sessionInfoPtr,
IN_ATTRIBUTE const SSH_ATTRIBUTE_TYPE attribute,
IN_INT_Z const int value );
CHECK_RETVAL STDC_NONNULL_ARG( ( 1 ) ) \
@@ -697,6 +705,18 @@
/* Prototypes for functions in ssh2_msgcli.c */
+CHECK_RETVAL STDC_NONNULL_ARG( ( 1, 2 ) ) \
+int getServiceType( INOUT_PTR SESSION_INFO *sessionInfoPtr,
+ OUT_ENUM_OPT( SERVICE ) SERVICE_TYPE *serviceType );
+ CHECK_RETVAL STDC_NONNULL_ARG( ( 1, 2 ) ) \
+int createSessionOpenRequest( INOUT_PTR SESSION_INFO *sessionInfoPtr,
+ INOUT_PTR STREAM *stream,
+ IN_ENUM( SERVICE ) \
+ const SERVICE_TYPE serviceType );
+CHECK_RETVAL STDC_NONNULL_ARG( ( 1, 2 ) ) \
+int processChannelOpenFailure( INOUT_PTR SESSION_INFO *sessionInfoPtr, INOUT_PTR STREAM *stream );
+CHECK_RETVAL STDC_NONNULL_ARG( ( 1, 2 ) ) \
+int processChannelOpenConfirmation( INOUT_PTR SESSION_INFO *sessionInfoPtr, INOUT_PTR STREAM *stream );
CHECK_RETVAL STDC_NONNULL_ARG( ( 1 ) ) \
int sendChannelOpen( INOUT_PTR SESSION_INFO *sessionInfoPtr );
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment