lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RxRPC: Declare the security index constants symbolically

Browse Source 
Declare the security index constants symbolically rather than just referring
to them numerically.

Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Howells
2009-09-14 01:17:30 +00:00
committed by David S. Miller
parent 531afd64d0
commit 8b815477f3
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/rxrpc.h
View File

@@ -58,5 +58,12 @@ struct sockaddr_rxrpc {
#define RXRPC_SECURITY_AUTH 1 /* authenticated packets */ #define RXRPC_SECURITY_AUTH 1 /* authenticated packets */
#define RXRPC_SECURITY_ENCRYPT 2 /* encrypted packets */ #define RXRPC_SECURITY_ENCRYPT 2 /* encrypted packets */
/*
* RxRPC security indices
*/
#define RXRPC_SECURITY_NONE 0 /* no security protocol */
#define RXRPC_SECURITY_RXKAD 2 /* kaserver or kerberos 4 */
#define RXRPC_SECURITY_RXGK 4 /* gssapi-based */
#define RXRPC_SECURITY_RXK5 5 /* kerberos 5 */
#endif /* _LINUX_RXRPC_H */ #endif /* _LINUX_RXRPC_H */

4
net/rxrpc/ar-key.c
View File

@@ -122,7 +122,7 @@ static int rxrpc_instantiate(struct key *key, const void *data, size_t datalen)
tsec->ticket[6], tsec->ticket[7]); tsec->ticket[6], tsec->ticket[7]);
ret = -EPROTONOSUPPORT; ret = -EPROTONOSUPPORT;
if (tsec->security_index != 2) if (tsec->security_index != RXRPC_SECURITY_RXKAD)
goto error; goto error;
key->type_data.x[0] = tsec->security_index; key->type_data.x[0] = tsec->security_index;
@@ -308,7 +308,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *conn,
_debug("key %d", key_serial(key)); _debug("key %d", key_serial(key));
data.kver = 1; data.kver = 1;
data.tsec.security_index = 2; data.tsec.security_index = RXRPC_SECURITY_RXKAD;
data.tsec.ticket_len = 0; data.tsec.ticket_len = 0;
data.tsec.expiry = expiry; data.tsec.expiry = expiry;
data.tsec.kvno = 0; data.tsec.kvno = 0;

6
net/rxrpc/rxkad.c
View File

@@ -42,7 +42,7 @@ struct rxkad_level2_hdr {
__be32 checksum; /* decrypted data checksum */ __be32 checksum; /* decrypted data checksum */
}; };
MODULE_DESCRIPTION("RxRPC network protocol type-2 security (Kerberos)"); MODULE_DESCRIPTION("RxRPC network protocol type-2 security (Kerberos 4)");
MODULE_AUTHOR("Red Hat, Inc."); MODULE_AUTHOR("Red Hat, Inc.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
@@ -506,7 +506,7 @@ static int rxkad_verify_packet(const struct rxrpc_call *call,
if (!call->conn->cipher) if (!call->conn->cipher)
return 0; return 0;
if (sp->hdr.securityIndex != 2) { if (sp->hdr.securityIndex != RXRPC_SECURITY_RXKAD) {
*_abort_code = RXKADINCONSISTENCY; *_abort_code = RXKADINCONSISTENCY;
_leave(" = -EPROTO [not rxkad]"); _leave(" = -EPROTO [not rxkad]");
return -EPROTO; return -EPROTO;
@@ -1122,7 +1122,7 @@ static void rxkad_clear(struct rxrpc_connection *conn)
static struct rxrpc_security rxkad = { static struct rxrpc_security rxkad = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "rxkad", .name = "rxkad",
.security_index = RXKAD_VERSION, .security_index = RXRPC_SECURITY_RXKAD,
.init_connection_security = rxkad_init_connection_security, .init_connection_security = rxkad_init_connection_security,
.prime_packet_security = rxkad_prime_packet_security, .prime_packet_security = rxkad_prime_packet_security,
.secure_packet = rxkad_secure_packet, .secure_packet = rxkad_secure_packet,