aboutsummaryrefslogtreecommitdiffstats
path: root/sys/linux/key.txt
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2019-07-15 10:45:40 -0700
committerDmitry Vyukov <dvyukov@google.com>2019-07-16 10:08:43 +0200
commit84d08cdf2d65976799e858fd6add094cd462b506 (patch)
tree95917d02ecb228c7e677dee08820f81590ab0eeb /sys/linux/key.txt
parent6732e2c0330c7389c92c4f7ddd307bf13dab7714 (diff)
sys/linux: update for v5.3 again
Update descriptions to be compatible with latest linux-next (next-20190715), which in theory will match v5.3-rc1 when the merge window closes. - KEYCTL_GRANT_PERMISSION was reverted. So remove its description. - CRYPTO_ALG_TYPE_DIGEST was removed. So remove its description. - IB_QP_CREATE_SIGNATURE_EN was renamed to IB_QP_CREATE_INTEGRITY_EN. Also remove the sys/linux/rdma_*.const files which were incorrectly checked into git. The real copies of those files are in sys/linux/dev_infiniband_rdma_*.const. For now I did *not* check for other new APIs that need to be described.
Diffstat (limited to 'sys/linux/key.txt')
-rw-r--r--sys/linux/key.txt4
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/linux/key.txt b/sys/linux/key.txt
index bdd26ed4b..25e1cb4c6 100644
--- a/sys/linux/key.txt
+++ b/sys/linux/key.txt
@@ -53,13 +53,9 @@ keyctl$KEYCTL_PKEY_VERIFY(code const[KEYCTL_PKEY_VERIFY], params ptr[in, keyctl_
keyctl$KEYCTL_RESTRICT_KEYRING(code const[KEYCTL_RESTRICT_KEYRING], key key, type ptr[in, string[key_type], opt], restriction ptr[in, key_restriction, opt])
keyctl$KEYCTL_MOVE(code const[KEYCTL_MOVE], key key, from_keyring keyring, to_keyring keyring, flags flags[keyctl_move_flags])
keyctl$KEYCTL_CAPABILITIES(code const[KEYCTL_CAPABILITIES], buffer ptr[out, array[int8]], buflen len[buffer])
-keyctl$KEYCTL_GRANT_PERMISSION(code const[KEYCTL_GRANT_PERMISSION], keyid key, type flags[key_ace_subject_type], subject flags[key_ace_standard_subject], perm flags[key_ace_perm])
reqkey_keyring = KEY_REQKEY_DEFL_NO_CHANGE, KEY_REQKEY_DEFL_DEFAULT, KEY_REQKEY_DEFL_THREAD_KEYRING, KEY_REQKEY_DEFL_PROCESS_KEYRING, KEY_REQKEY_DEFL_SESSION_KEYRING, KEY_REQKEY_DEFL_USER_KEYRING, KEY_REQKEY_DEFL_USER_SESSION_KEYRING, KEY_REQKEY_DEFL_GROUP_KEYRING, KEY_REQKEY_DEFL_REQUESTOR_KEYRING
keyctl_move_flags = KEYCTL_MOVE_EXCL
-key_ace_subject_type = KEY_ACE_SUBJ_STANDARD
-key_ace_standard_subject = KEY_ACE_EVERYONE, KEY_ACE_GROUP, KEY_ACE_OWNER, KEY_ACE_POSSESSOR
-key_ace_perm = KEY_ACE_VIEW, KEY_ACE_READ, KEY_ACE_WRITE, KEY_ACE_SEARCH, KEY_ACE_LINK, KEY_ACE_SET_SECURITY, KEY_ACE_INVAL, KEY_ACE_REVOKE, KEY_ACE_JOIN, KEY_ACE_CLEAR
key_perm = KEY_POS_VIEW, KEY_POS_READ, KEY_POS_WRITE, KEY_POS_SEARCH, KEY_POS_LINK, KEY_POS_SETATTR, KEY_USR_VIEW, KEY_USR_READ, KEY_USR_WRITE, KEY_USR_SEARCH, KEY_USR_LINK, KEY_USR_SETATTR, KEY_GRP_VIEW, KEY_GRP_READ, KEY_GRP_WRITE, KEY_GRP_SEARCH, KEY_GRP_LINK, KEY_GRP_SETATTR, KEY_OTH_VIEW, KEY_OTH_READ, KEY_OTH_WRITE, KEY_OTH_SEARCH, KEY_OTH_LINK, KEY_OTH_SETATTR
key_type = "asymmetric", "big_key", "blacklist", "ceph", "cifs.idmap", "cifs.spnego", ".dead", "dns_resolver", "encrypted", "id_legacy", "id_resolver", "keyring", "logon", "pkcs7_test", ".request_key_auth", "rxrpc", "rxrpc_s", "syzkaller", "trusted", "user"