diff options
| author | Hans Nilsson <[email protected]> | 2015-10-19 12:43:47 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-19 12:43:47 +0200 |
| commit | 5ea9a240688f43f81eb607d79e4161f9085024e7 (patch) | |
| tree | 15795977e2a9cff06913cc1c41ba6bf96b39fa7d /lib/ssh/src/ssh.hrl | |
| parent | 5f73e439578c4356db26804f47e8b50901a8e45a (diff) | |
| parent | fdae664715f6b64e3f0c61729344bc372b67e1e2 (diff) | |
| download | otp-5ea9a240688f43f81eb607d79e4161f9085024e7.tar.gz otp-5ea9a240688f43f81eb607d79e4161f9085024e7.tar.bz2 otp-5ea9a240688f43f81eb607d79e4161f9085024e7.zip | |
Merge branch 'maint'
* maint:
ssh: Implemented ssh_transport:ecdh_validate_public_key (partly)
ssh: dialyzer fix
public_key: add/update -spec for ssh functions
ssh, public_key: use pubkey encode/decode in app public_key
ssh, public_key: Change EC Public Key representation to what was intended
Diffstat (limited to 'lib/ssh/src/ssh.hrl')
| -rw-r--r-- | lib/ssh/src/ssh.hrl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl index da64e4abf9..fc9d60c500 100644 --- a/lib/ssh/src/ssh.hrl +++ b/lib/ssh/src/ssh.hrl @@ -37,13 +37,16 @@ -define(FALSE, 0). -define(TRUE, 1). %% basic binary constructors --define(BOOLEAN(X), X:8/unsigned-big-integer). --define(BYTE(X), X:8/unsigned-big-integer). --define(UINT16(X), X:16/unsigned-big-integer). --define(UINT32(X), X:32/unsigned-big-integer). --define(UINT64(X), X:64/unsigned-big-integer). +-define(BOOLEAN(X), (X):8/unsigned-big-integer). +-define(BYTE(X), (X):8/unsigned-big-integer). +-define(UINT16(X), (X):16/unsigned-big-integer). +-define(UINT32(X), (X):32/unsigned-big-integer). +-define(UINT64(X), (X):64/unsigned-big-integer). -define(STRING(X), ?UINT32((size(X))), (X)/binary). +-define(DEC_BIN(X,Len), ?UINT32(Len), X:Len/binary ). +-define(DEC_MPINT(I,Len), ?UINT32(Len), I:Len/big-signed-integer-unit:8 ). + %% building macros -define(boolean(X), case X of |