mirror of https://gogs.blitter.com/RLabs/xs
Merge branch 'master' into hkexcp-proto
This commit is contained in:
commit
e3e38fb6fa
2
TODO.txt
2
TODO.txt
|
@ -6,7 +6,7 @@ Chaff Improvements
|
||||||
- Client-input chaff file data (ie., Moby Dick)
|
- Client-input chaff file data (ie., Moby Dick)
|
||||||
|
|
||||||
Architecture
|
Architecture
|
||||||
- Move hkexnet components other than key exchange into a proper hkex package
|
(DONE) - Move hkexnet components other than key exchange into a proper hkex package
|
||||||
(ie., hkexsh imports hkex) - hkex should be usable for other client/svr utils,
|
(ie., hkexsh imports hkex) - hkex should be usable for other client/svr utils,
|
||||||
ala 'hkex-netcat')
|
ala 'hkex-netcat')
|
||||||
- Make KEx fully-pluggable: isolate all code to do with Herradura into a
|
- Make KEx fully-pluggable: isolate all code to do with Herradura into a
|
||||||
|
|
|
@ -44,12 +44,17 @@ const (
|
||||||
|
|
||||||
/*---------------------------------------------------------------------*/
|
/*---------------------------------------------------------------------*/
|
||||||
|
|
||||||
type WinSize struct {
|
type (
|
||||||
|
WinSize struct {
|
||||||
Rows uint16
|
Rows uint16
|
||||||
Cols uint16
|
Cols uint16
|
||||||
}
|
}
|
||||||
|
|
||||||
type ChaffConfig struct {
|
// chaffconfig captures attributes used to send chaff packets betwixt
|
||||||
|
// client and server connections, to obscure true traffic timing and
|
||||||
|
// patterns
|
||||||
|
// see: https://en.wikipedia.org/wiki/chaff_(countermeasure)
|
||||||
|
ChaffConfig struct {
|
||||||
shutdown bool //set to inform chaffHelper to shut down
|
shutdown bool //set to inform chaffHelper to shut down
|
||||||
enabled bool
|
enabled bool
|
||||||
msecsMin uint //msecs min interval
|
msecsMin uint //msecs min interval
|
||||||
|
@ -58,7 +63,7 @@ type ChaffConfig struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Conn is a HKex connection - a superset of net.Conn
|
// Conn is a HKex connection - a superset of net.Conn
|
||||||
type Conn struct {
|
Conn struct {
|
||||||
m *sync.Mutex
|
m *sync.Mutex
|
||||||
c net.Conn // which also implements io.Reader, io.Writer, ...
|
c net.Conn // which also implements io.Reader, io.Writer, ...
|
||||||
h *hkex.HerraduraKEx
|
h *hkex.HerraduraKEx
|
||||||
|
@ -77,6 +82,7 @@ type Conn struct {
|
||||||
wm hash.Hash
|
wm hash.Hash
|
||||||
dBuf *bytes.Buffer //decrypt buffer for Read()
|
dBuf *bytes.Buffer //decrypt buffer for Read()
|
||||||
}
|
}
|
||||||
|
)
|
||||||
|
|
||||||
func (hc Conn) GetStatus() uint8 {
|
func (hc Conn) GetStatus() uint8 {
|
||||||
return *hc.closeStat
|
return *hc.closeStat
|
||||||
|
|
Loading…
Reference in New Issue