diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/rxrpc/ar-key.c | 4 | ||||
-rw-r--r-- | net/rxrpc/rxkad.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c index ad8c7a782da1..b3d10e7ccd7e 100644 --- a/net/rxrpc/ar-key.c +++ b/net/rxrpc/ar-key.c | |||
@@ -122,7 +122,7 @@ static int rxrpc_instantiate(struct key *key, const void *data, size_t datalen) | |||
122 | tsec->ticket[6], tsec->ticket[7]); | 122 | tsec->ticket[6], tsec->ticket[7]); |
123 | 123 | ||
124 | ret = -EPROTONOSUPPORT; | 124 | ret = -EPROTONOSUPPORT; |
125 | if (tsec->security_index != 2) | 125 | if (tsec->security_index != RXRPC_SECURITY_RXKAD) |
126 | goto error; | 126 | goto error; |
127 | 127 | ||
128 | key->type_data.x[0] = tsec->security_index; | 128 | key->type_data.x[0] = tsec->security_index; |
@@ -308,7 +308,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *conn, | |||
308 | _debug("key %d", key_serial(key)); | 308 | _debug("key %d", key_serial(key)); |
309 | 309 | ||
310 | data.kver = 1; | 310 | data.kver = 1; |
311 | data.tsec.security_index = 2; | 311 | data.tsec.security_index = RXRPC_SECURITY_RXKAD; |
312 | data.tsec.ticket_len = 0; | 312 | data.tsec.ticket_len = 0; |
313 | data.tsec.expiry = expiry; | 313 | data.tsec.expiry = expiry; |
314 | data.tsec.kvno = 0; | 314 | data.tsec.kvno = 0; |
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index ef8f91030a15..acec76292c01 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c | |||
@@ -42,7 +42,7 @@ struct rxkad_level2_hdr { | |||
42 | __be32 checksum; /* decrypted data checksum */ | 42 | __be32 checksum; /* decrypted data checksum */ |
43 | }; | 43 | }; |
44 | 44 | ||
45 | MODULE_DESCRIPTION("RxRPC network protocol type-2 security (Kerberos)"); | 45 | MODULE_DESCRIPTION("RxRPC network protocol type-2 security (Kerberos 4)"); |
46 | MODULE_AUTHOR("Red Hat, Inc."); | 46 | MODULE_AUTHOR("Red Hat, Inc."); |
47 | MODULE_LICENSE("GPL"); | 47 | MODULE_LICENSE("GPL"); |
48 | 48 | ||
@@ -506,7 +506,7 @@ static int rxkad_verify_packet(const struct rxrpc_call *call, | |||
506 | if (!call->conn->cipher) | 506 | if (!call->conn->cipher) |
507 | return 0; | 507 | return 0; |
508 | 508 | ||
509 | if (sp->hdr.securityIndex != 2) { | 509 | if (sp->hdr.securityIndex != RXRPC_SECURITY_RXKAD) { |
510 | *_abort_code = RXKADINCONSISTENCY; | 510 | *_abort_code = RXKADINCONSISTENCY; |
511 | _leave(" = -EPROTO [not rxkad]"); | 511 | _leave(" = -EPROTO [not rxkad]"); |
512 | return -EPROTO; | 512 | return -EPROTO; |
@@ -1122,7 +1122,7 @@ static void rxkad_clear(struct rxrpc_connection *conn) | |||
1122 | static struct rxrpc_security rxkad = { | 1122 | static struct rxrpc_security rxkad = { |
1123 | .owner = THIS_MODULE, | 1123 | .owner = THIS_MODULE, |
1124 | .name = "rxkad", | 1124 | .name = "rxkad", |
1125 | .security_index = RXKAD_VERSION, | 1125 | .security_index = RXRPC_SECURITY_RXKAD, |
1126 | .init_connection_security = rxkad_init_connection_security, | 1126 | .init_connection_security = rxkad_init_connection_security, |
1127 | .prime_packet_security = rxkad_prime_packet_security, | 1127 | .prime_packet_security = rxkad_prime_packet_security, |
1128 | .secure_packet = rxkad_secure_packet, | 1128 | .secure_packet = rxkad_secure_packet, |