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
e865c517
Commit
e865c517
authored
4 years ago
by
Deucе
Browse files
Options
Downloads
Patches
Plain Diff
Fix SSH height/width parameters set get works as well as set.
parent
ecc690f5
No related branches found
No related tags found
1 merge request
!463
MRC mods by Codefenix (2024-10-20)
Pipeline
#1478
passed
4 years ago
Stage: build
Changes
1
Pipelines
3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
3rdp/build/terminal-params.patch
+20
-11
20 additions, 11 deletions
3rdp/build/terminal-params.patch
with
20 additions
and
11 deletions
3rdp/build/terminal-params.patch
+
20
−
11
View file @
e865c517
diff -ur ../tmp2/cryptlib.h ./cryptlib.h
diff -ur ../tmp2/cryptlib.h ./cryptlib.h
--- ../tmp2/cryptlib.h 20
19-02-22 03:16:30.000000
000 -0500
--- ../tmp2/cryptlib.h 20
21-03-13 02:55:28.589948
000 -0500
+++ ./cryptlib.h 20
19-06-03 15:26:26.741166
000 -0
4
00
+++ ./cryptlib.h 20
21-03-13 02:56:03.550287
000 -0
5
00
@@ -1222,6 +1222,11 @@
@@ -1222,6 +1222,11 @@
CRYPT_SESSINFO_SSL_EAPKEY, /* SSL/TLS EAP key */
CRYPT_SESSINFO_SSL_EAPKEY, /* SSL/TLS EAP key */
CRYPT_SESSINFO_TSP_MSGIMPRINT, /* TSP message imprint */
CRYPT_SESSINFO_TSP_MSGIMPRINT, /* TSP message imprint */
...
@@ -14,8 +14,8 @@ diff -ur ../tmp2/cryptlib.h ./cryptlib.h
...
@@ -14,8 +14,8 @@ diff -ur ../tmp2/cryptlib.h ./cryptlib.h
CRYPT_SESSINFO_LAST, CRYPT_USERINFO_FIRST = 7000,
CRYPT_SESSINFO_LAST, CRYPT_USERINFO_FIRST = 7000,
diff -ur ../tmp2/kernel/attr_acl.c ./kernel/attr_acl.c
diff -ur ../tmp2/kernel/attr_acl.c ./kernel/attr_acl.c
--- ../tmp2/kernel/attr_acl.c 20
19-02-05 18:16:32.000000
000 -0500
--- ../tmp2/kernel/attr_acl.c 20
21-03-13 02:55:42.258577
000 -0500
+++ ./kernel/attr_acl.c 20
19-06-03 15:26:26.745123
000 -0
4
00
+++ ./kernel/attr_acl.c 20
21-03-13 02:56:03.603279
000 -0
5
00
@@ -3768,6 +3768,25 @@
@@ -3768,6 +3768,25 @@
MKPERM_TSP( xWD_xWD ),
MKPERM_TSP( xWD_xWD ),
ROUTE( OBJECT_TYPE_SESSION ), &objectCtxHash ),
ROUTE( OBJECT_TYPE_SESSION ), &objectCtxHash ),
...
@@ -43,9 +43,18 @@ diff -ur ../tmp2/kernel/attr_acl.c ./kernel/attr_acl.c
...
@@ -43,9 +43,18 @@ diff -ur ../tmp2/kernel/attr_acl.c ./kernel/attr_acl.c
};
};
#endif /* USE_SESSIONS */
#endif /* USE_SESSIONS */
diff -ur ../tmp2/session/sess_attr.c ./session/sess_attr.c
diff -ur ../tmp2/session/sess_attr.c ./session/sess_attr.c
--- ../tmp2/session/sess_attr.c 2019-02-05 18:18:28.000000000 -0500
--- ../tmp2/session/sess_attr.c 2021-03-13 02:55:28.307665000 -0500
+++ ./session/sess_attr.c 2019-06-03 15:26:26.746525000 -0400
+++ ./session/sess_attr.c 2021-03-13 02:56:30.118602000 -0500
@@ -639,6 +639,7 @@
@@ -565,6 +565,8 @@
SESSION_FLAG_ISOPEN ) ? TRUE : FALSE;
return( CRYPT_OK );
+ case CRYPT_SESSINFO_SSH_HEIGHT:
+ case CRYPT_SESSINFO_SSH_WIDTH:
case CRYPT_SESSINFO_SERVER_PORT:
case CRYPT_SESSINFO_CLIENT_PORT:
{
@@ -639,6 +641,7 @@
return( CRYPT_ERROR_NOTFOUND );
return( CRYPT_ERROR_NOTFOUND );
}
}
...
@@ -53,7 +62,7 @@ diff -ur ../tmp2/session/sess_attr.c ./session/sess_attr.c
...
@@ -53,7 +62,7 @@ diff -ur ../tmp2/session/sess_attr.c ./session/sess_attr.c
case CRYPT_SESSINFO_USERNAME:
case CRYPT_SESSINFO_USERNAME:
case CRYPT_SESSINFO_PASSWORD:
case CRYPT_SESSINFO_PASSWORD:
/* If the session was resumed from cached information then the
/* If the session was resumed from cached information then the
@@ -797,6 +
798
,13 @@
@@ -797,6 +
800
,13 @@
return( status );
return( status );
}
}
...
@@ -77,7 +86,7 @@ diff -ur ../tmp2/session/sess_attr.c ./session/sess_attr.c
...
@@ -77,7 +86,7 @@ diff -ur ../tmp2/session/sess_attr.c ./session/sess_attr.c
case CRYPT_SESSINFO_SERVER_FINGERPRINT_SHA1:
case CRYPT_SESSINFO_SERVER_FINGERPRINT_SHA1:
/* Remember the value */
/* Remember the value */
return( addSessionInfoS( sessionInfoPtr, attribute, data,
return( addSessionInfoS( sessionInfoPtr, attribute, data,
@@ -1016,6 +102
7
,7 @@
@@ -1016,6 +102
9
,7 @@
sessionInfoPtr->writeTimeout = CRYPT_ERROR;
sessionInfoPtr->writeTimeout = CRYPT_ERROR;
return( CRYPT_OK );
return( CRYPT_OK );
...
@@ -86,8 +95,8 @@ diff -ur ../tmp2/session/sess_attr.c ./session/sess_attr.c
...
@@ -86,8 +95,8 @@ diff -ur ../tmp2/session/sess_attr.c ./session/sess_attr.c
case CRYPT_SESSINFO_PASSWORD:
case CRYPT_SESSINFO_PASSWORD:
case CRYPT_SESSINFO_SERVER_NAME:
case CRYPT_SESSINFO_SERVER_NAME:
diff -ur ../tmp2/session/ssh2_msgc.c ./session/ssh2_msgc.c
diff -ur ../tmp2/session/ssh2_msgc.c ./session/ssh2_msgc.c
--- ../tmp2/session/ssh2_msgc.c 20
18-12-21
0
3
:5
2:10.000000
000 -0500
--- ../tmp2/session/ssh2_msgc.c 20
21-03-13
0
2
:5
5:27.112993
000 -0500
+++ ./session/ssh2_msgc.c 20
19-06-03 15:26:26.74740
2000 -0
4
00
+++ ./session/ssh2_msgc.c 20
21-03-13 02:56:03.67166
2000 -0
5
00
@@ -448,6 +448,12 @@
@@ -448,6 +448,12 @@
CHANNEL_WRITE );
CHANNEL_WRITE );
int packetOffset, status;
int packetOffset, status;
...
...
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