Add new enctypes for gss_krb5 (Round 4)
Subsystems (3)
cover Add new enctypes for gss_krb5 (Round 4)
From: Steve Dickson <[email protected]>
This is round 4 of the Kevin Coffman's patches that added three additional encryption types to the rpcsec_gss kernel code. Here is a pointer to Kevin's last posting
http://marc.info/?l=linux-nfs&m=121010783625159&w=2
These patches were tested a this year's connectathon in which not issues were found.
There are also a three nfs-utils patches that needed to be applied to the gssd daemons to complete this. Those will be posted asap...
Please consider including these in the next kernel release...
steved.
Kevin Coffman (21):
gss_krb5: introduce encryption type framework
Don't expect blocksize to always be 8 when calculating padding
gss_krb5: gss_krb5: split up functions in preparation of adding new
enctypes
gss_krb5: prepare for new context format
gss_krb5: introduce encryption type framework
gss_krb5: add ability to have a keyed checksum (hmac)
gss_krb5: import functionality to derive keys into the kernel
gss_krb5: handle new context format from gssd
gss_krb5: add support for triple-des encryption
Add new pipefs file indicating which Kerberos enctypes the kernel
supports
Update pipefs file indicating which Kerberos enctypes the kernel
supports
xdr: Add an export for the helper function write_bytes_to_xdr_buf()
gss_krb5: add support for new token formats in rfc4121
gss_krb5: add remaining pieces to enable AES encryption support
gss_krb5: Update pipefs file
arcfour-hmac support
Save the raw session key in the context
More arcfour-hmac support
Use confounder length in wrap code
Add support for rc4-hmac encryption
Update the pipefs file
Peter Staubach (1):
Fixed memory leak in gss_import_v1_context()
include/linux/sunrpc/gss_krb5.h | 184 ++++++++- net/sunrpc/auth_gss/Makefile | 2 +- net/sunrpc/auth_gss/auth_gss.c | 14 +- net/sunrpc/auth_gss/gss_krb5_crypto.c | 715 ++++++++++++++++++++++++++++++++- net/sunrpc/auth_gss/gss_krb5_keys.c | 335 +++++++++++++++ net/sunrpc/auth_gss/gss_krb5_mech.c | 581 +++++++++++++++++++++++++-- net/sunrpc/auth_gss/gss_krb5_seal.c | 156 ++++++-- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 83 ++++- net/sunrpc/auth_gss/gss_krb5_unseal.c | 113 +++++- net/sunrpc/auth_gss/gss_krb5_wrap.c | 476 +++++++++++++++++++--- net/sunrpc/auth_gss/gss_mech_switch.c | 14 + net/sunrpc/auth_gss/svcauth_gss.c | 15 + net/sunrpc/rpc_pipe.c | 31 ++ net/sunrpc/xdr.c | 1 + 14 files changed, 2553 insertions(+), 167 deletions(-) create mode 100644 net/sunrpc/auth_gss/gss_krb5_keys.c
PATCH 1/22 gss_krb5: introduce encryption type framework
From: Kevin Coffman <[email protected]>
Make the client and server code consistent regarding the extra buffer space made available for the auth code when wrapping data.
Add some comments/documentation about the available buffer space in the xdr_buf head and tail when gss_wrap is called.
Add a compile-time check to make sure we are not exceeding the available buffer space.
Add a central function to shift head data.
--- include/linux/sunrpc/gss_krb5.h | 25 ++++++++++++++ net/sunrpc/auth_gss/auth_gss.c | 14 ++++++-- net/sunrpc/auth_gss/gss_krb5_crypto.c | 56 +++++++++++++++++++++++++++++++++ net/sunrpc/auth_gss/gss_krb5_wrap.c | 7 ++-- net/sunrpc/auth_gss/gss_mech_switch.c | 14 ++++++++ net/sunrpc/auth_gss/svcauth_gss.c | 15 +++++++++ 6 files changed, 123 insertions(+), 8 deletions(-)
include/linux/sunrpc/gss_krb5.h +25 -0
@@ -40,6 +40,12 @@#include <linux/sunrpc/gss_err.h> #include <linux/sunrpc/gss_asn1.h> +/* Maximum checksum function output for the supported crypto algorithms */ +#define GSS_KRB5_MAX_CKSUM_LEN (20) + +/* Maximum blocksize for the supported crypto algorithms */ +#define GSS_KRB5_MAX_BLOCKSIZE (16) +struct krb5_ctx {int initiate;/* 1 = initiating, 0 = accepting */ struct crypto_blkcipher *enc;
@@ -113,6 +119,22 @@ enum seal_alg {#define ENCTYPE_DES3_CBC_SHA1 0x0010#define ENCTYPE_UNKNOWN 0x01ff +/* +* This compile-time check verifies that we will not exceed the +* slack space allotted by the client and server auth_gss code +* before they call gss_wrap(). +*/ +#define GSS_KRB5_SLACK_CHECK \ + BUILD_BUG_ON(GSS_KRB5_TOK_HDR_LEN/* gss token header */ \ + +GSS_KRB5_MAX_CKSUM_LEN /* gss token checksum */ \ + +GSS_KRB5_MAX_BLOCKSIZE /* confounder */ \ + +GSS_KRB5_MAX_BLOCKSIZE /* possible padding */ \ + +GSS_KRB5_TOK_HDR_LEN /* encrypted hdr in v2 token */ \ + +GSS_KRB5_MAX_CKSUM_LEN /* encryption hmac */ \ + +4 +4 /* RPC verifier */ \ + +GSS_KRB5_TOK_HDR_LEN \ + + GSS_KRB5_MAX_CKSUM_LEN > RPC_MAX_AUTH_SIZE) + s32 make_checksum(char *, char *header, int hdrlen, struct xdr_buf *body, int body_offset, struct xdr_netobj *cksum);
@@ -157,3 +179,6 @@ s32 krb5_get_seq_num(struct crypto_blkcipher *key, unsigned char *cksum, unsigned char *buf, int *direction, u32 *seqnum); + +int +shift_head_data (struct xdr_buf *buf,unsigned int base,unsigned int shiftlen);
net/sunrpc/auth_gss/auth_gss.c +10 -4
@@ -61,7 +61,7 @@ static const struct rpc_credops gss_nullops;# define RPCDBG_FACILITY RPCDBG_AUTH#endif -#define GSS_CRED_SLACK 1024 +#define GSS_CRED_SLACK (RPC_MAX_AUTH_SIZE * 2)/* length of a krb5 verifier (48), plus data added before arguments when * using integrity (two 4-byte integers): */ #define GSS_VERF_SLACK 100
@@ -1317,15 +1317,21 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, inpages = snd_buf->pages + first; snd_buf->pages = rqstp->rq_enc_pages; snd_buf->page_base -= first <<PAGE_CACHE_SHIFT ; -/* Give the tail its own page, in case we need extra space in the -* head when wrapping: */ +/* +* Give the tail its own page, in case we need extra space in the +* head when wrapping: +* +* call_allocate() allocates twice the slack space required +* by the authentication flavor to rq_callsize. +* For GSS, slack is GSS_CRED_SLACK. +*/ if (snd_buf->page_len || snd_buf->tail[0 ].iov_len) { tmp =page_address (rqstp->rq_enc_pages[rqstp->rq_enc_pages_num -1 ]);memcpy (tmp, snd_buf->tail[0 ].iov_base, snd_buf->tail[0 ].iov_len); snd_buf->tail[0 ].iov_base = tmp; } maj_stat =gss_wrap (ctx->gc_gss_ctx, offset, snd_buf, inpages); -/* RPC_SLACK_SPACE should prevent this ever happening: */ +/* slack space should prevent this ever happening: */ BUG_ON (snd_buf->len > snd_buf->buflen); status = -EIO ;/* We're assuming that when GSS_S_CONTEXT_EXPIRED, the encryption was
net/sunrpc/auth_gss/gss_krb5_crypto.c +56 -0
59 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_wrap.c +3 -4
@@ -144,6 +144,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset,dprintk ("RPC: gss_wrap_kerberos\n" ); +GSS_KRB5_SLACK_CHECK ; now =get_seconds (); blocksize =crypto_blkcipher_blocksize (kctx->enc);
@@ -156,11 +157,9 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset, ptr = buf->head[0 ].iov_base + offset;/* shift data to make room for header. */ +shift_head_data (buf, offset, headlen); +/* XXX Would be cleverer to encrypt while copying. */ -/* XXX bounds checking, slack, etc. */ -memmove (ptr + headlen, ptr, buf->head[0 ].iov_len - offset); - buf->head[0 ].iov_len += headlen; - buf->len += headlen;BUG_ON ((buf->len - offset - headlen) % blocksize); g_make_token_header(&kctx->mech_used,
net/sunrpc/auth_gss/gss_mech_switch.c +14 -0
@@ -285,6 +285,20 @@ gss_verify_mic(struct gss_ctx *context_handle, mic_token); } +/* +* This function is called from both the client and server code. +* Each makes guarantees about how much "slack" space is available +* for the underlying function in "buf"'s head and tail while +* performing the wrap. +* +* The client and server code allocate RPC_MAX_AUTH_SIZE extra +* space in both the head and tail which is available for use by +* the wrap function. +* +* Underlying functions should verify they do not use more than +* RPC_MAX_AUTH_SIZE of extra space in either the head or tail +* when performing the wrap. +*/ u32 gss_wrap(struct gss_ctx *ctx_id, int offset,
net/sunrpc/auth_gss/svcauth_gss.c +15 -0
@@ -1314,6 +1314,14 @@ svcauth_gss_wrap_resp_priv(struct svc_rqst *rqstp) inpages = resbuf->pages;/* XXX: Would be better to write some xdr helper functions for * nfs{2,3,4}xdr.c that place the data right, instead of copying: */ + +/* +* If there is currently tail data, make sure there is +* room for the head, tail, and 2 * RPC_MAX_AUTH_SIZE in +* the page, and move the current tail data such that +* there is RPC_MAX_AUTH_SIZE slack space available in +* both the head and tail. +*/ if (resbuf->tail[0 ].iov_base) {BUG_ON (resbuf->tail[0 ].iov_base >= resbuf->head[0 ].iov_base +PAGE_SIZE );
@@ -1326,6 +1334,13 @@ svcauth_gss_wrap_resp_priv(struct svc_rqst *rqstp) resbuf->tail[0].iov_len); resbuf->tail[0 ].iov_base +=RPC_MAX_AUTH_SIZE ; } +/* +* If there is no current tail data, make sure there is +* room for the head data, and 2 * RPC_MAX_AUTH_SIZE in the +* allotted page, and set up tail information such that there +* is RPC_MAX_AUTH_SIZE slack space available in both the +* head and tail. +*/ if (resbuf->tail[0 ].iov_base ==NULL ) {if (resbuf->head[0 ].iov_len +2 *RPC_MAX_AUTH_SIZE >PAGE_SIZE )return -ENOMEM ;
Signature · 1 line
1.6.6.1
Re: [PATCH 01/22] gss_krb5: introduce encryption type framework
Quoted 88 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
Make the client and server code consistent regarding the extra buffer space made available for the auth code when wrapping data.
Add some comments/documentation about the available buffer space in the
xdr_bufhead and tail whengss_wrapis called.Add a compile-time check to make sure we are not exceeding the available buffer space.
Add a central function to shift head data.
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- include/linux/sunrpc/gss_krb5.h | 25 ++++++++++++++ net/sunrpc/auth_gss/auth_gss.c | 14 ++++++-- net/sunrpc/auth_gss/gss_krb5_crypto.c | 56 +++++++++++++++++++++++++++++++++ net/sunrpc/auth_gss/gss_krb5_wrap.c | 7 ++-- net/sunrpc/auth_gss/gss_mech_switch.c | 14 ++++++++ net/sunrpc/auth_gss/svcauth_gss.c | 15 +++++++++ 6 files changed, 123 insertions(+), 8 deletions(-)include/linux/sunrpc/gss_krb5.h +25
-0@@ -40,6 +40,12 @@#include <linux/sunrpc/gss_err.h> #include <linux/sunrpc/gss_asn1.h> +/* Maximum checksum function output for the supported crypto algorithms */ +#define GSS_KRB5_MAX_CKSUM_LEN (20) + +/* Maximum blocksize for the supported crypto algorithms */ +#define GSS_KRB5_MAX_BLOCKSIZE (16) +struct krb5_ctx {int initiate;/* 1 = initiating, 0 = accepting */ struct crypto_blkcipher *enc;@@ -113,6 +119,22 @@ enum seal_alg {#define ENCTYPE_DES3_CBC_SHA1 0x0010#define ENCTYPE_UNKNOWN 0x01ff +/* +* This compile-time check verifies that we will not exceed the +* slack space allotted by the client and server auth_gss code +* before they call gss_wrap(). +*/ +#define GSS_KRB5_SLACK_CHECK \ + BUILD_BUG_ON(GSS_KRB5_TOK_HDR_LEN/* gss token header */ \ + +GSS_KRB5_MAX_CKSUM_LEN /* gss token checksum */ \ + +GSS_KRB5_MAX_BLOCKSIZE /* confounder */ \ + +GSS_KRB5_MAX_BLOCKSIZE /* possible padding */ \ + +GSS_KRB5_TOK_HDR_LEN /* encrypted hdr in v2 token */ \ + +GSS_KRB5_MAX_CKSUM_LEN /* encryption hmac */ \ + +4 +4 /* RPC verifier */ \ + +GSS_KRB5_TOK_HDR_LEN \ + + GSS_KRB5_MAX_CKSUM_LEN > RPC_MAX_AUTH_SIZE) + s32 make_checksum(char *, char *header, int hdrlen, struct xdr_buf *body, int body_offset, struct xdr_netobj *cksum);@@ -157,3 +179,6 @@ s32 krb5_get_seq_num(struct crypto_blkcipher *key, unsigned char *cksum, unsigned char *buf, int *direction, u32 *seqnum); + +int +shift_head_data (struct xdr_buf *buf,unsigned int base,unsigned int shiftlen);net/sunrpc/auth_gss/auth_gss.c +1
-1@@ -61,7 +61,7 @@ static const struct rpc_credops gss_nullops;# define RPCDBG_FACILITY RPCDBG_AUTH#endif -#define GSS_CRED_SLACK 1024 +#define GSS_CRED_SLACK (RPC_MAX_AUTH_SIZE * 2)/* length of a krb5 verifier (48), plus data added before arguments when * using integrity (two 4-byte integers): */ #define GSS_VERF_SLACK 100@@ -1317,15 +1317,21 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, inpages = snd_buf->pages + first; snd_buf->pages = rqstp->rq_enc_pages; snd_buf->page_base -= first <<PAGE_CACHE_SHIFT ;
net/sunrpc/auth_gss/auth_gss.c gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, · line 1327
Quoted 10 lines
net/sunrpc/auth_gss/auth_gss.c +8
-2-/* Give the tail its own page, in case we need extra space in the -* head when wrapping: */ +/* +* Give the tail its own page, in case we need extra space in the +* head when wrapping: +* +* call_allocate() allocates twice the slack space required +* by the authentication flavor to rq_callsize. +* For GSS, slack is GSS_CRED_SLACK. +*/
I'm all for improving the comments in the code, but could we please make that a separate patch.
Quoted 29 lines
net/sunrpc/auth_gss/auth_gss.c +1
-1if (snd_buf->page_len || snd_buf->tail[0 ].iov_len) { tmp =page_address (rqstp->rq_enc_pages[rqstp->rq_enc_pages_num -1 ]);memcpy (tmp, snd_buf->tail[0 ].iov_base, snd_buf->tail[0 ].iov_len); snd_buf->tail[0 ].iov_base = tmp; } maj_stat =gss_wrap (ctx->gc_gss_ctx, offset, snd_buf, inpages); -/* RPC_SLACK_SPACE should prevent this ever happening: */ +/* slack space should prevent this ever happening: */ BUG_ON (snd_buf->len > snd_buf->buflen); status = -EIO ;/* We're assuming that when GSS_S_CONTEXT_EXPIRED, the encryption was net/sunrpc/auth_gss/gss_krb5_crypto.c +10
-0@@ -326,3 +326,59 @@ gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf,return xdr_process_buf (buf, offset, buf->len - offset, decryptor, &desc); } + +/* +* This function makes the assumption that it was ultimately called +* from gss_wrap(). +* +* The client auth_gss code moves any existing tail data into a +* separate page before calling gss_wrap. +* The server svcauth_gss code ensures that both the head and the +* tail have slack space of RPC_MAX_AUTH_SIZE before calling gss_wrap. +*
net/sunrpc/auth_gss/gss_krb5_crypto.c gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, · line 348
Quoted 10 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c +10
-0+* Even with that guarantee, this function may be called more than +* once in the processing of gss_wrap(). The best we can do is +* verify at compile-time (see GSS_KRB5_SLACK_CHECK) that the +* largest expected shift will fit within RPC_MAX_AUTH_SIZE. +* At run-time we can verify that a single invocation of this +* function doesn't attempt to use more the RPC_MAX_AUTH_SIZE. +*/ + +int +shift_head_data (struct xdr_buf *buf,unsigned int base,unsigned int shiftlen)
^^^^^^^^^^^^^^^
This needs a better name in order to avoid polluting the global namespace. xdr_extend_head(), perhaps?
net/sunrpc/auth_gss/gss_krb5_crypto.c gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, · line 355
Quoted 7 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c +7
-0+{ +u8 *p; + +if (shiftlen ==0 ) +return 0 ; + +GSS_KRB5_SLACK_CHECK ;
^^^^^^^^^^^^^^^^^^^^^
Why is this a macro?
net/sunrpc/auth_gss/gss_krb5_crypto.c gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, · line 365
Quoted 10 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c +10
-0+BUG_ON (shiftlen >RPC_MAX_AUTH_SIZE ); + +/* +* If there is a tail, and it shares a page with the head, +* make sure we don't clobber the tail. This is a just a +* defensive check. +*/ +if (buf->tail[0 ].iov_base !=NULL ) { + if ((((long)buf->tail[0].iov_base >> PAGE_CACHE_SHIFT) == + ((long)buf->head[0].iov_base >> PAGE_CACHE_SHIFT)) &&
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This is just too ugly to live, and is wrong to boot. If buf->tail[0].iov_len == 0, then buf->tail[0].iov_base isn't even defined...
Quoted 24 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c +19
-0+ buf->tail[0].iov_base - buf->head[0].iov_base < shiftlen) { +dprintk ("%s: collision: head %p:%zu, tail %p:%zu, " +"shiftlen %u\n" , + __func__, buf->head[0 ].iov_base, + buf->head[0 ].iov_len, buf->tail[0 ].iov_base, + buf->tail[0 ].iov_len, shiftlen); +return 1 ; + } + } + + p = buf->head[0 ].iov_base + base; + +memmove (p + shiftlen, p, buf->head[0 ].iov_len - base); + + buf->head[0 ].iov_len += shiftlen; + buf->len += shiftlen; + +return 0 ; +}net/sunrpc/auth_gss/gss_krb5_wrap.c +0
-0
net/sunrpc/auth_gss/gss_krb5_wrap.c gss_wrap_kerberos(struct gss_ctx *ctx, int offset, · line 147
Quoted 4 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c +1
-0@@ -144,6 +144,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset,dprintk ("RPC: gss_wrap_kerberos\n" ); +GSS_KRB5_SLACK_CHECK ;
....and why do we have a second one here? Since this is a BUILD_BUG, then surely we can check this just once.
Quoted 17 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c +2
-4now =get_seconds (); blocksize =crypto_blkcipher_blocksize (kctx->enc);@@ -156,11 +157,9 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset, ptr = buf->head[0 ].iov_base + offset;/* shift data to make room for header. */ +shift_head_data (buf, offset, headlen); +/* XXX Would be cleverer to encrypt while copying. */ -/* XXX bounds checking, slack, etc. */ -memmove (ptr + headlen, ptr, buf->head[0 ].iov_len - offset); - buf->head[0 ].iov_len += headlen; - buf->len += headlen;BUG_ON ((buf->len - offset - headlen) % blocksize); g_make_token_header(&kctx->mech_used,
A message that is not in the archive (sent off-list or not yet received): 1268668733.2993.90.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
Re: [PATCH 01/22] gss_krb5: introduce encryption type framework
Quoted 94 lines · Trond Myklebust
Quoted 93 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
Make the client and server code consistent regarding the extra buffer space made available for the auth code when wrapping data.
Add some comments/documentation about the available buffer space in the
xdr_bufhead and tail whengss_wrapis called.Add a compile-time check to make sure we are not exceeding the available buffer space.
Add a central function to shift head data.
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- include/linux/sunrpc/gss_krb5.h | 25 ++++++++++++++ net/sunrpc/auth_gss/auth_gss.c | 14 ++++++-- net/sunrpc/auth_gss/gss_krb5_crypto.c | 56 +++++++++++++++++++++++++++++++++ net/sunrpc/auth_gss/gss_krb5_wrap.c | 7 ++-- net/sunrpc/auth_gss/gss_mech_switch.c | 14 ++++++++ net/sunrpc/auth_gss/svcauth_gss.c | 15 +++++++++ 6 files changed, 123 insertions(+), 8 deletions(-)include/linux/sunrpc/gss_krb5.h +25
-0@@ -40,6 +40,12 @@#include <linux/sunrpc/gss_err.h> #include <linux/sunrpc/gss_asn1.h> +/* Maximum checksum function output for the supported crypto algorithms */ +#define GSS_KRB5_MAX_CKSUM_LEN (20) + +/* Maximum blocksize for the supported crypto algorithms */ +#define GSS_KRB5_MAX_BLOCKSIZE (16) +struct krb5_ctx {int initiate;/* 1 = initiating, 0 = accepting */ struct crypto_blkcipher *enc;@@ -113,6 +119,22 @@ enum seal_alg {#define ENCTYPE_DES3_CBC_SHA1 0x0010#define ENCTYPE_UNKNOWN 0x01ff +/* +* This compile-time check verifies that we will not exceed the +* slack space allotted by the client and server auth_gss code +* before they call gss_wrap(). +*/ +#define GSS_KRB5_SLACK_CHECK \ + BUILD_BUG_ON(GSS_KRB5_TOK_HDR_LEN/* gss token header */ \ + +GSS_KRB5_MAX_CKSUM_LEN /* gss token checksum */ \ + +GSS_KRB5_MAX_BLOCKSIZE /* confounder */ \ + +GSS_KRB5_MAX_BLOCKSIZE /* possible padding */ \ + +GSS_KRB5_TOK_HDR_LEN /* encrypted hdr in v2 token */ \ + +GSS_KRB5_MAX_CKSUM_LEN /* encryption hmac */ \ + +4 +4 /* RPC verifier */ \ + +GSS_KRB5_TOK_HDR_LEN \ + + GSS_KRB5_MAX_CKSUM_LEN > RPC_MAX_AUTH_SIZE) + s32 make_checksum(char *, char *header, int hdrlen, struct xdr_buf *body, int body_offset, struct xdr_netobj *cksum);@@ -157,3 +179,6 @@ s32 krb5_get_seq_num(struct crypto_blkcipher *key, unsigned char *cksum, unsigned char *buf, int *direction, u32 *seqnum); + +int +shift_head_data (struct xdr_buf *buf,unsigned int base,unsigned int shiftlen);net/sunrpc/auth_gss/auth_gss.c +4
-3@@ -61,7 +61,7 @@ static const struct rpc_credops gss_nullops;# define RPCDBG_FACILITY RPCDBG_AUTH#endif -#define GSS_CRED_SLACK 1024 +#define GSS_CRED_SLACK (RPC_MAX_AUTH_SIZE * 2)/* length of a krb5 verifier (48), plus data added before arguments when * using integrity (two 4-byte integers): */ #define GSS_VERF_SLACK 100@@ -1317,15 +1317,21 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, inpages = snd_buf->pages + first; snd_buf->pages = rqstp->rq_enc_pages; snd_buf->page_base -= first <<PAGE_CACHE_SHIFT ; -/* Give the tail its own page, in case we need extra space in the -* head when wrapping: */ +/* +* Give the tail its own page, in case we need extra space in the +* head when wrapping:
Quoted 8 lines
net/sunrpc/auth_gss/auth_gss.c gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, · line 1327
Quoted 5 lines
net/sunrpc/auth_gss/auth_gss.c +5
-0+* +* call_allocate() allocates twice the slack space required +* by the authentication flavor to rq_callsize. +* For GSS, slack is GSS_CRED_SLACK. +*/ I'm all for improving the comments in the code, but could we please make that a separate patch.
Really? I'm curious... what is not clear about the above diff
Quoted 35 lines
Quoted 35 lines
net/sunrpc/auth_gss/auth_gss.c +1
-1if (snd_buf->page_len || snd_buf->tail[0 ].iov_len) { tmp =page_address (rqstp->rq_enc_pages[rqstp->rq_enc_pages_num -1 ]);memcpy (tmp, snd_buf->tail[0 ].iov_base, snd_buf->tail[0 ].iov_len); snd_buf->tail[0 ].iov_base = tmp; } maj_stat =gss_wrap (ctx->gc_gss_ctx, offset, snd_buf, inpages); -/* RPC_SLACK_SPACE should prevent this ever happening: */ +/* slack space should prevent this ever happening: */ BUG_ON (snd_buf->len > snd_buf->buflen); status = -EIO ;/* We're assuming that when GSS_S_CONTEXT_EXPIRED, the encryption was net/sunrpc/auth_gss/gss_krb5_crypto.c +15
-0@@ -326,3 +326,59 @@ gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf,return xdr_process_buf (buf, offset, buf->len - offset, decryptor, &desc); } + +/* +* This function makes the assumption that it was ultimately called +* from gss_wrap(). +* +* The client auth_gss code moves any existing tail data into a +* separate page before calling gss_wrap. +* The server svcauth_gss code ensures that both the head and the +* tail have slack space of RPC_MAX_AUTH_SIZE before calling gss_wrap. +* +* Even with that guarantee, this function may be called more than +* once in the processing of gss_wrap(). The best we can do is +* verify at compile-time (see GSS_KRB5_SLACK_CHECK) that the +* largest expected shift will fit within RPC_MAX_AUTH_SIZE. +* At run-time we can verify that a single invocation of this
Quoted 8 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, · line 348
Quoted 5 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c +5
-0+* function doesn't attempt to use more the RPC_MAX_AUTH_SIZE. +*/ + +int +shift_head_data (struct xdr_buf *buf,unsigned int base,unsigned int shiftlen)^^^^^^^^^^^^^^^
This needs a better name in order to avoid polluting the global namespace.xdr_extend_head(), perhaps?
xdr_extend_head() it is...
Quoted 10 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, · line 355
Quoted 8 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c +7
-0+{ +u8 *p; + +if (shiftlen ==0 ) +return 0 ; + +GSS_KRB5_SLACK_CHECK ;^^^^^^^^^^^^^^^^^^^^^
Why is this a macro?
To hide the ugliness of the BUILD_BUG_ON() macro which I think is a good thing... I would rather see that one line verse the 10 or so lines it hiding...
Quoted 12 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, · line 365
Quoted 11 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c +10
-0+BUG_ON (shiftlen >RPC_MAX_AUTH_SIZE ); + +/* +* If there is a tail, and it shares a page with the head, +* make sure we don't clobber the tail. This is a just a +* defensive check. +*/ +if (buf->tail[0 ].iov_base !=NULL ) { + if ((((long)buf->tail[0].iov_base >> PAGE_CACHE_SHIFT) == + ((long)buf->head[0].iov_base >> PAGE_CACHE_SHIFT)) &&^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Quoted 3 lines
This is just too ugly to live, and is wrong to boot. If buf->tail[0].iov_len == 0, then buf->tail[0].iov_base isn't even defined...
I'm just going to remove this check...
Quoted 26 lines
Quoted 26 lines
net/sunrpc/auth_gss/gss_krb5_crypto.c +19
-0+ buf->tail[0].iov_base - buf->head[0].iov_base < shiftlen) { +dprintk ("%s: collision: head %p:%zu, tail %p:%zu, " +"shiftlen %u\n" , + __func__, buf->head[0 ].iov_base, + buf->head[0 ].iov_len, buf->tail[0 ].iov_base, + buf->tail[0 ].iov_len, shiftlen); +return 1 ; + } + } + + p = buf->head[0 ].iov_base + base; + +memmove (p + shiftlen, p, buf->head[0 ].iov_len - base); + + buf->head[0 ].iov_len += shiftlen; + buf->len += shiftlen; + +return 0 ; +}net/sunrpc/auth_gss/gss_krb5_wrap.c +0
-0@@ -144,6 +144,7 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset,
Quoted 6 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c gss_wrap_kerberos(struct gss_ctx *ctx, int offset, · line 147
Quoted 3 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c +1
-0dprintk ("RPC: gss_wrap_kerberos\n" ); +GSS_KRB5_SLACK_CHECK ;....and why do we have a second one here? Since this is a
BUILD_BUG, then surely we can check this just once.
right... this one is gone...
Quoted 20 lines
Quoted 18 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c +2
-4now =get_seconds (); blocksize =crypto_blkcipher_blocksize (kctx->enc);@@ -156,11 +157,9 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset, ptr = buf->head[0 ].iov_base + offset;/* shift data to make room for header. */ +shift_head_data (buf, offset, headlen); +/* XXX Would be cleverer to encrypt while copying. */ -/* XXX bounds checking, slack, etc. */ -memmove (ptr + headlen, ptr, buf->head[0 ].iov_len - offset); - buf->head[0 ].iov_len += headlen; - buf->len += headlen;BUG_ON ((buf->len - offset - headlen) % blocksize); g_make_token_header(&kctx->mech_used,
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH 01/22] gss_krb5: introduce encryption type framework
Quoted 20 lines · Steve Dickson
Quoted 10 lines · Trond Myklebust
Quoted 9 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
net/sunrpc/auth_gss/auth_gss.c +3
-2@@ -1317,15 +1317,21 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, inpages = snd_buf->pages + first; snd_buf->pages = rqstp->rq_enc_pages; snd_buf->page_base -= first <<PAGE_CACHE_SHIFT ; -/* Give the tail its own page, in case we need extra space in the -* head when wrapping: */ +/* +* Give the tail its own page, in case we need extra space in the +* head when wrapping: Quoted 8 lines
net/sunrpc/auth_gss/auth_gss.c gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, · line 1327
Quoted 5 lines
net/sunrpc/auth_gss/auth_gss.c +5
-0+* +* call_allocate() allocates twice the slack space required +* by the authentication flavor to rq_callsize. +* For GSS, slack is GSS_CRED_SLACK. +*/ I'm all for improving the comments in the code, but could we please make that a separate patch.
Quoted 1 line
Really? I'm curious... what is not clear about the above diff
The comments are unrelated to the functionality changes of the patch, and are distracting when you are just trying to figure out those changes.
Splitting out the comments (except those directly related to code that is being changed) therefore helps readability.
Quoted 7 lines
Quoted 4 lines
Review gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, · line 1329
Quoted 2 lines
(quoted diff) +2
-0+ + GSS_KRB5_SLACK_CHECK;^^^^^^^^^^^^^^^^^^^^^
Why is this a macro?To hide the ugliness of the
BUILD_BUG_ON()macro which I think is a good thing... I would rather see that one line verse the 10 or so lines it hiding...
I wouldn't.
I can accept putting that _sum_ into a macro, but expanding the BUILD_BUG_ON.
IOW:
#define GSS_KRB5_MAX_SLACK_NEEDED \ GSS_KRB5_TOK_HDR_LEN /* gss token header */ \ + GSS_KRB5_MAX_CKSUM_LEN /* gss token checksum */ \ + GSS_KRB5_MAX_BLOCKSIZE /* confounder */ \ .... \ )
and then inserting the following line above
BUILD_BUG_ON(GSS_KRB5_MAX_SLACK_NEEDED > RPC_MAX_AUTH_SIZE);
That makes it obvious what is being checked and why.
Speaking of obvious. Exactly why is GSS_KRB5_TOK_HDR_LEN and GSS_KRB5_MAX_CKSUM_LEN being included twice in that calculation? The second two instances have no comments explaining their presence...
A message that is not in the archive (sent off-list or not yet received): 1268774075.3098.56.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
Re: [PATCH 01/22] gss_krb5: introduce encryption type framework
Quoted 21 lines · Trond Myklebust
Quoted 20 lines · Steve Dickson
Quoted 18 lines · Trond Myklebust
Quoted 4 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
(quoted diff) +0
-0@@ -1317,15 +1317,21 @@ gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, inpages = snd_buf->pages + first; snd_buf->pages = rqstp->rq_enc_pages; snd_buf->page_base -= first << PAGE_CACHE_SHIFT;Review gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, · line 1327
Quoted 10 lines
(quoted diff) +8
-2- /* Give the tail its own page, in case we need extra space in the - * head when wrapping: */ + /* + * Give the tail its own page, in case we need extra space in the + * head when wrapping: + * + * call_allocate() allocates twice the slack space required + * by the authentication flavor to rq_callsize. + * For GSS, slack is GSS_CRED_SLACK. + */I'm all for improving the comments in the code, but could we please make that a separate patch.
Quoted 7 lines
Quoted 1 line
Really? I'm curious... what is not clear about the above diff
The comments are unrelated to the functionality changes of the patch, and are distracting when you are just trying to figure out those changes.
Splitting out the comments (except those directly related to code that is being changed) therefore helps readability.
I guess.. but at the end of the day it all ends up in the same place...
The comments will be broken into a separate patch...
Quoted 23 lines
Quoted 8 lines
Quoted 5 lines
Review gss_wrap_req_priv(struct rpc_cred *cred, struct gss_cl_ctx *ctx, · line 1329
Quoted 3 lines
(quoted diff) +2
-0+ + GSS_KRB5_SLACK_CHECK;^^^^^^^^^^^^^^^^^^^^^
Why is this a macro?To hide the ugliness of the
BUILD_BUG_ON()macro which I think is a good thing... I would rather see that one line verse the 10 or so lines it hiding...I wouldn't.
I can accept putting that _sum_ into a macro, but expanding the
BUILD_BUG_ON.IOW:
#define GSS_KRB5_MAX_SLACK_NEEDED \ GSS_KRB5_TOK_HDR_LEN /* gss token header */ \ + GSS_KRB5_MAX_CKSUM_LEN /* gss token checksum */ \ + GSS_KRB5_MAX_BLOCKSIZE /* confounder */ \ .... \ )
Quoted 5 lines
and then inserting the following line above
BUILD_BUG_ON(GSS_KRB5_MAX_SLACK_NEEDED > RPC_MAX_AUTH_SIZE);That makes it obvious what is being checked and why.
The above BUILD_BUG_ON() will be added...
steved.
Re: [PATCH 01/22] gss_krb5: introduce encryption type framework
In reply to a message not in the archiveQuoted 15 lines · Trond Myklebust
Quoted 11 lines · Steve Dickson
Quoted 6 lines · Trond Myklebust
Quoted 2 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
+
+ =A0GSS_KRB5_SLACK_CHECK;=A0 =A0 =A0 =A0 =A0 ^^^^^^^^^^^^^^^^^^^^^
=A0 =A0 =A0 =A0 =A0 =A0 =A0 Why is this a macro?To hide the ugliness of the
BUILD_BUG_ON()macro which I think is a good thing... I would rather see that one line verse the 10 or so lines it hiding...I wouldn't.
Quoted 7 lines
I can accept putting that _sum_ into a macro, but expanding the
BUILD_BUG_ON.IOW:
#define
GSS_KRB5_MAX_SLACK_NEEDED\
=A0 =A0 =A0 =A0GSS_KRB5_TOK_HDR_LEN =A0 =A0 =A0/* gss token header */=
=A0 =A0 =A0 =A0 \
Quoted 1 line
=A0 =A0 =A0 =A0+
GSS_KRB5_MAX_CKSUM_LEN=A0/* gss token checksum */ =A0=
=A0 =A0 \
Quoted 1 line
=A0 =A0 =A0 =A0+
GSS_KRB5_MAX_BLOCKSIZE=A0/* confounder */ =A0 =A0 =A0=
=A0 =A0 =A0 =A0 \
Quoted 8 lines
=A0 =A0 =A0 =A0.... \
=A0 =A0 =A0 =A0)and then inserting the following line above
BUILD_BUG_ON(GSS_KRB5_MAX_SLACK_NEEDED > RPC_MAX_AUTH_SIZE);That makes it obvious what is being checked and why.
fwiw, I agree!
Quoted 3 lines
Speaking of obvious. Exactly why is
GSS_KRB5_TOK_HDR_LENandGSS_KRB5_MAX_CKSUM_LENbeing included twice in that calculation? The second two instances have no comments explaining their presence...
I'll look back and see if there is a reason, or if this is just wrong.
I believe there is another checksum, so I think it is correct. But
supporting comments do seem necessary.
I'll be travelling with limited network access until Monday, so I might not give a prompt reply.
K.C.
PATCH 2/22 Don't expect blocksize to always be 8 when calculating padding
In reply to [email protected]From: Kevin Coffman <[email protected]>
Allow blocksizes other than 8 when calculating padding
--- net/sunrpc/auth_gss/gss_krb5_wrap.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
net/sunrpc/auth_gss/gss_krb5_wrap.c +1 -4
@@ -13,10 +13,7 @@static inline int gss_krb5_padding (int blocksize,int length) { -/* Most of the code is block-size independent but currently we -* use only 8: */ -BUG_ON (blocksize !=8 ); -return 8 - (length &7 ); +return blocksize - (length & (blocksize -1 )); } static inline void
Signature · 1 line
1.6.6.1
Re: [PATCH 02/22] Don't expect blocksize to always be 8 when calculating padding
Quoted 15 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
Allow blocksizes other than 8 when calculating padding
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- net/sunrpc/auth_gss/gss_krb5_wrap.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)net/sunrpc/auth_gss/gss_krb5_wrap.c +0
-0
net/sunrpc/auth_gss/gss_krb5_wrap.c line 18
Quoted 10 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c +1
-4@@ -13,10 +13,7 @@static inline int gss_krb5_padding (int blocksize,int length) { -/* Most of the code is block-size independent but currently we -* use only 8: */ -BUG_ON (blocksize !=8 ); -return 8 - (length &7 ); +return blocksize - (length & (blocksize -1 )); }
What happens if blocksize is not a power of 2?
A message that is not in the archive (sent off-list or not yet received): 1268668930.2993.91.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
Re: [PATCH 02/22] Don't expect blocksize to always be 8 when calculating padding
Quoted 20 lines · Trond Myklebust
Quoted 19 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
Allow blocksizes other than 8 when calculating padding
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- net/sunrpc/auth_gss/gss_krb5_wrap.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)net/sunrpc/auth_gss/gss_krb5_wrap.c +0
-1@@ -13,10 +13,7 @@static inline int gss_krb5_padding (int blocksize,int length) { -/* Most of the code is block-size independent but currently we
Quoted 8 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c line 18
Quoted 6 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c +1
-3-* use only 8: */ -BUG_ON (blocksize !=8 ); -return 8 - (length &7 ); +return blocksize - (length & (blocksize -1 )); }What happens if blocksize is not a power of 2?
It's extremely unlikely we'll care about any blocksize other than 8 or 16 bytes, but may as well make this:
return blocksize - (length % blocksize)
--b.
Re: [PATCH 02/22] Don't expect blocksize to always be 8 when calculating padding
Quoted 30 lines · J. Bruce Fields
Quoted 20 lines · Trond Myklebust
Quoted 19 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
Allow blocksizes other than 8 when calculating padding
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- net/sunrpc/auth_gss/gss_krb5_wrap.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)net/sunrpc/auth_gss/gss_krb5_wrap.c +0
-1@@ -13,10 +13,7 @@static inline int gss_krb5_padding (int blocksize,int length) { -/* Most of the code is block-size independent but currently we Quoted 8 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c line 18
Quoted 6 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c +1
-3-* use only 8: */ -BUG_ON (blocksize !=8 ); -return 8 - (length &7 ); +return blocksize - (length & (blocksize -1 )); }What happens if blocksize is not a power of 2?
Quoted 4 lines
It's extremely unlikely we'll care about any blocksize other than 8 or 16 bytes, but may as well make this:
return blocksize - (length % blocksize)
Ok...
steved.
PATCH 3/22 gss_krb5: gss_krb5: split up functions in preparation of adding new enctypes
In reply to [email protected]From: Kevin Coffman <[email protected]>
Add encryption type to the krb5 context structure and use it to switch to the correct functions depending on the encryption type.
--- include/linux/sunrpc/gss_krb5.h | 1 + net/sunrpc/auth_gss/gss_krb5_mech.c | 1 + net/sunrpc/auth_gss/gss_krb5_seal.c | 20 ++++++++++++++-- net/sunrpc/auth_gss/gss_krb5_unseal.c | 21 +++++++++++++++-- net/sunrpc/auth_gss/gss_krb5_wrap.c | 38 +++++++++++++++++++++++++++----- 5 files changed, 69 insertions(+), 12 deletions(-)
include/linux/sunrpc/gss_krb5.h +1 -0
@@ -48,6 +48,7 @@struct krb5_ctx {int initiate;/* 1 = initiating, 0 = accepting */ +u32 enctype;struct crypto_blkcipher *enc;struct crypto_blkcipher *seq;s32 endtime;
net/sunrpc/auth_gss/gss_krb5_mech.c +1 -0
@@ -139,6 +139,7 @@ gss_import_sec_context_kerberos(const void *p, p =simple_get_bytes (p, end, &ctx->initiate,sizeof (ctx->initiate));if (IS_ERR (p)) goto out_err_free_ctx; + ctx->enctype =ENCTYPE_DES_CBC_RAW ;/* The downcall format was designed before we completely understood * the uses of the context fields; so it includes some stuff we * just give some minimal sanity-checking, and some we ignore
net/sunrpc/auth_gss/gss_krb5_seal.c +17 -3
@@ -71,11 +71,10 @@DEFINE_SPINLOCK (krb5_seq_lock); -u32 -gss_get_mic_kerberos (struct gss_ctx *gss_ctx,struct xdr_buf *text, +static u32 +gss_get_mic_v1 (struct krb5_ctx *ctx,struct xdr_buf *text,struct xdr_netobj *token) { -struct krb5_ctx *ctx = gss_ctx->internal_ctx_id;char cksumdata[16 ];struct xdr_netobj md5cksum = {.len =0 , .data = cksumdata};unsigned char *ptr, *msg_start;
@@ -121,3 +120,18 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,return (ctx->endtime < now) ?GSS_S_CONTEXT_EXPIRED :GSS_S_COMPLETE ; } + +u32 +gss_get_mic_kerberos (struct gss_ctx *gss_ctx,struct xdr_buf *text, +struct xdr_netobj *token) +{ +struct krb5_ctx *ctx = gss_ctx->internal_ctx_id; + +switch (ctx->enctype) { +default : +BUG (); +case ENCTYPE_DES_CBC_RAW : +return gss_get_mic_v1 (ctx, text, token); + } +} +
net/sunrpc/auth_gss/gss_krb5_unseal.c +18 -3
@@ -71,11 +71,10 @@/* read_token is a mic token, and message_buffer is the data that the mic was * supposedly taken over. */ -u32 -gss_verify_mic_kerberos (struct gss_ctx *gss_ctx, +static u32 +gss_verify_mic_v1 (struct krb5_ctx *ctx,struct xdr_buf *message_buffer,struct xdr_netobj *read_token) { -struct krb5_ctx *ctx = gss_ctx->internal_ctx_id;int signalg;int sealalg;char cksumdata[16 ];
@@ -136,3 +135,19 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,return GSS_S_COMPLETE ; } + +u32 +gss_verify_mic_kerberos (struct gss_ctx *gss_ctx, +struct xdr_buf *message_buffer, +struct xdr_netobj *read_token) +{ +struct krb5_ctx *ctx = gss_ctx->internal_ctx_id; + +switch (ctx->enctype) { +default : +BUG (); +case ENCTYPE_DES_CBC_RAW : +return gss_verify_mic_v1 (ctx, message_buffer, read_token); + } +} +
net/sunrpc/auth_gss/gss_krb5_wrap.c +32 -6
@@ -125,11 +125,10 @@ make_confounder(char *p, u32 conflen)/* XXX factor out common code with seal/unseal. */ -u32 -gss_wrap_kerberos (struct gss_ctx *ctx,int offset, +static u32 +gss_wrap_kerberos_v1 (struct krb5_ctx *kctx,int offset,struct xdr_buf *buf,struct page **pages) { -struct krb5_ctx *kctx = ctx->internal_ctx_id;char cksumdata[16 ];struct xdr_netobj md5cksum = {.len =0 , .data = cksumdata};int blocksize =0 , plainlen;
@@ -205,10 +204,9 @@ gss_wrap_kerberos(struct gss_ctx *ctx, int offset,return (kctx->endtime < now) ?GSS_S_CONTEXT_EXPIRED :GSS_S_COMPLETE ; } -u32 -gss_unwrap_kerberos (struct gss_ctx *ctx,int offset,struct xdr_buf *buf) +static u32 +gss_unwrap_kerberos_v1 (struct krb5_ctx *kctx,int offset,struct xdr_buf *buf) { -struct krb5_ctx *kctx = ctx->internal_ctx_id;int signalg;int sealalg;char cksumdata[16 ];
@@ -296,3 +294,31 @@ gss_unwrap_kerberos(struct gss_ctx *ctx, int offset, struct xdr_buf *buf)return GSS_S_COMPLETE ; } + +u32 +gss_wrap_kerberos (struct gss_ctx *gctx,int offset, +struct xdr_buf *buf,struct page **pages) +{ +struct krb5_ctx *kctx = gctx->internal_ctx_id; + +switch (kctx->enctype) { +default : +BUG (); +case ENCTYPE_DES_CBC_RAW : +return gss_wrap_kerberos_v1 (kctx, offset, buf, pages); + } +} + +u32 +gss_unwrap_kerberos (struct gss_ctx *gctx,int offset,struct xdr_buf *buf) +{ +struct krb5_ctx *kctx = gctx->internal_ctx_id; + +switch (kctx->enctype) { +default : +BUG (); +case ENCTYPE_DES_CBC_RAW : +return gss_unwrap_kerberos_v1 (kctx, offset, buf); + } +} +
Signature · 1 line
1.6.6.1
PATCH 4/22 gss_krb5: prepare for new context format
In reply to [email protected]From: Kevin Coffman <[email protected]>
Prepare for new context format by splitting out the old "v1" context processing function
--- net/sunrpc/auth_gss/gss_krb5_mech.c | 39 +++++++++++++++++++++++++++------- 1 files changed, 31 insertions(+), 8 deletions(-)
net/sunrpc/auth_gss/gss_krb5_mech.c +31 -8
@@ -123,9 +123,7 @@ out_err: }static int -gss_import_sec_context_kerberos (const void *p, -size_t len, -struct gss_ctx *ctx_id) +gss_import_v1_context (const void *p,const void *end,struct krb5_ctx *ctx) {const void *end = (const void *)((const char *)p + len);struct krb5_ctx *ctx;
@@ -139,7 +137,10 @@ gss_import_sec_context_kerberos(const void *p, p =simple_get_bytes (p, end, &ctx->initiate,sizeof (ctx->initiate));if (IS_ERR (p)) goto out_err_free_ctx; + +/* Old format supports only DES! Any other enctype uses new format */ ctx->enctype =ENCTYPE_DES_CBC_RAW ; +/* The downcall format was designed before we completely understood * the uses of the context fields; so it includes some stuff we * just give some minimal sanity-checking, and some we ignore
@@ -181,9 +182,6 @@ gss_import_sec_context_kerberos(const void *p, goto out_err_free_key2; } - ctx_id->internal_ctx_id = ctx; - -dprintk ("RPC: Successfully imported new context.\n" );return 0 ; out_err_free_key2:
@@ -192,12 +190,37 @@ out_err_free_key1:crypto_free_blkcipher (ctx->enc); out_err_free_mech:kfree (ctx->mech_used.data); -out_err_free_ctx: -kfree (ctx); out_err:return PTR_ERR (p); } +static int +gss_import_sec_context_kerberos (const void *p,size_t len, +struct gss_ctx *ctx_id) +{ +const void *end = (const void *)((const char *)p + len); +struct krb5_ctx *ctx; +int ret; + + ctx =kmalloc (sizeof (*ctx),GFP_KERNEL ); +if (ctx ==NULL ) +return -ENOMEM ; +memset (ctx,0 ,sizeof (*ctx)); + +if (len ==85 ) + ret =gss_import_v1_context (p, end, ctx); +else + ret = -EINVAL ; + +if (ret ==0 ) + ctx_id->internal_ctx_id = ctx; +else +kfree (ctx); + +dprintk ("RPC: %s: returning %d\n" , __func__, ret); +return ret; +} +static void gss_delete_sec_context_kerberos (void *internal_ctx) {struct krb5_ctx *kctx = internal_ctx;
Signature · 1 line
1.6.6.1
PATCH 5/22 gss_krb5: introduce encryption type framework
In reply to [email protected]From: Kevin Coffman <[email protected]>
Add enctype framework and change functions to use the generic values from it rather than the values hard-coded for des.
--- include/linux/sunrpc/gss_krb5.h | 25 +++++++++- net/sunrpc/auth_gss/gss_krb5_crypto.c | 18 ++++---- net/sunrpc/auth_gss/gss_krb5_mech.c | 85 +++++++++++++++++++++++++++----- net/sunrpc/auth_gss/gss_krb5_seal.c | 49 ++++++++++++------- net/sunrpc/auth_gss/gss_krb5_unseal.c | 15 ++++-- net/sunrpc/auth_gss/gss_krb5_wrap.c | 79 +++++++++++++++++++++++------- 6 files changed, 203 insertions(+), 68 deletions(-)
include/linux/sunrpc/gss_krb5.h +24 -1
@@ -4,7 +4,7 @@* Adapted from MIT Kerberos 5-1.2.1 lib/include/krb5.h, * lib/gssapi/krb5/gssapiP_krb5.h, and others * -* Copyright (c) 2000 The Regents of the University of Michigan. +* Copyright (c) 2000-2008 The Regents of the University of Michigan. * All rights reserved. * * Andy Adamson <[email protected]>
@@ -36,6 +36,7 @@* */ +#include <linux/crypto.h> #include <linux/sunrpc/auth_gss.h> #include <linux/sunrpc/gss_err.h> #include <linux/sunrpc/gss_asn1.h>
@@ -46,9 +47,31 @@/* Maximum blocksize for the supported crypto algorithms */ #define GSS_KRB5_MAX_BLOCKSIZE (16) +struct gss_krb5_enctype { +const u32 etype;/* encryption (key) type */ +const u32 ctype;/* checksum type */ +const char *name;/* "friendly" name */ +const char *encrypt_name;/* crypto encrypt name */ +const char *cksum_name;/* crypto checksum name */ +const u16 signalg;/* signing algorithm */ +const u16 sealalg;/* sealing algorithm */ +const u32 blocksize;/* encryption blocksize */ +const u32 cksumlength;/* checksum length */ +const u32 keyed_cksum;/* is it a keyed cksum? */ +const u32 keybytes;/* raw key len, in bytes */ +const u32 keylength;/* final key len, in bytes */ +u32 (*encrypt) (struct crypto_blkcipher *tfm, +void *iv,void *in,void *out, +int length);/* encryption function */ +u32 (*decrypt) (struct crypto_blkcipher *tfm, +void *iv,void *in,void *out, +int length);/* decryption function */ +}; +struct krb5_ctx {int initiate;/* 1 = initiating, 0 = accepting */ u32 enctype; +struct gss_krb5_enctype *gk5e;/* enctype-specific info */ struct crypto_blkcipher *enc;struct crypto_blkcipher *seq;s32 endtime;
net/sunrpc/auth_gss/gss_krb5_crypto.c +9 -9
@@ -1,7 +1,7 @@/* * linux/net/sunrpc/gss_krb5_crypto.c * -* Copyright (c) 2000 The Regents of the University of Michigan. +* Copyright (c) 2000-2008 The Regents of the University of Michigan. * All rights reserved. * * Andy Adamson <[email protected]>
@@ -59,13 +59,13 @@ krb5_encrypt( {u32 ret = -EINVAL ;struct scatterlist sg[1 ]; -u8 local_iv[16 ] = {0 }; +u8 local_iv[GSS_KRB5_MAX_BLOCKSIZE ] = {0 };struct blkcipher_desc desc = { .tfm = tfm, .info = local_iv };if (length %crypto_blkcipher_blocksize (tfm) !=0 ) goto out; -if (crypto_blkcipher_ivsize (tfm) >16 ) { +if (crypto_blkcipher_ivsize (tfm) >GSS_KRB5_MAX_BLOCKSIZE ) {dprintk ("RPC: gss_k5encrypt: tfm iv size too large %d\n" ,crypto_blkcipher_ivsize (tfm)); goto out;
@@ -93,13 +93,13 @@ krb5_decrypt( {u32 ret = -EINVAL ;struct scatterlist sg[1 ]; -u8 local_iv[16 ] = {0 }; +u8 local_iv[GSS_KRB5_MAX_BLOCKSIZE ] = {0 };struct blkcipher_desc desc = { .tfm = tfm, .info = local_iv };if (length %crypto_blkcipher_blocksize (tfm) !=0 ) goto out; -if (crypto_blkcipher_ivsize (tfm) >16 ) { +if (crypto_blkcipher_ivsize (tfm) >GSS_KRB5_MAX_BLOCKSIZE ) {dprintk ("RPC: gss_k5decrypt: tfm iv size too large %d\n" ,crypto_blkcipher_ivsize (tfm)); goto out;
@@ -158,7 +158,7 @@ out: }struct encryptor_desc { -u8 iv[8 ];/* XXX hard-coded blocksize */ +u8 iv[GSS_KRB5_MAX_BLOCKSIZE ];struct blkcipher_desc desc;int pos;struct xdr_buf *outbuf;
@@ -199,7 +199,7 @@ encryptor(struct scatterlist *sg, void *data) desc->fraglen += sg->length; desc->pos += sg->length; - fraglen = thislen &7 ;/* XXX hardcoded blocksize */ + fraglen = thislen & (crypto_blkcipher_blocksize (desc->desc.tfm) -1 ); thislen -= fraglen;if (thislen ==0 )
@@ -257,7 +257,7 @@ gss_encrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, }struct decryptor_desc { -u8 iv[8 ];/* XXX hard-coded blocksize */ +u8 iv[GSS_KRB5_MAX_BLOCKSIZE ];struct blkcipher_desc desc;struct scatterlist frags[4 ];int fragno;
@@ -279,7 +279,7 @@ decryptor(struct scatterlist *sg, void *data) desc->fragno++; desc->fraglen += sg->length; - fraglen = thislen &7 ;/* XXX hardcoded blocksize */ + fraglen = thislen & (crypto_blkcipher_blocksize (desc->desc.tfm) -1 ); thislen -= fraglen;if (thislen ==0 )
net/sunrpc/auth_gss/gss_krb5_mech.c +71 -14
125 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_seal.c +30 -19
73 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_unseal.c +9 -6
@@ -3,7 +3,7 @@* * Adapted from MIT Kerberos 5-1.2.1 lib/gssapi/krb5/k5unseal.c * -* Copyright (c) 2000 The Regents of the University of Michigan. +* Copyright (c) 2000-2008 The Regents of the University of Michigan. * All rights reserved. * * Andy Adamson <[email protected]>
@@ -77,8 +77,9 @@ gss_verify_mic_v1(struct krb5_ctx *ctx, {int signalg;int sealalg; -char cksumdata[16 ]; -struct xdr_netobj md5cksum = {.len =0 , .data = cksumdata}; +char cksumdata[GSS_KRB5_MAX_CKSUM_LEN ]; +struct xdr_netobj md5cksum = {.len =sizeof (cksumdata), + .data = cksumdata};s32 now;int direction;u32 seqnum;
@@ -98,7 +99,7 @@ gss_verify_mic_v1(struct krb5_ctx *ctx,/* XXX sanity-check bodysize?? */ signalg = ptr[2 ] + (ptr[3 ] <<8 ); -if (signalg !=SGN_ALG_DES_MAC_MD5 ) +if (signalg != ctx->gk5e->signalg)return GSS_S_DEFECTIVE_TOKEN ; sealalg = ptr[4 ] + (ptr[5 ] <<8 );
@@ -108,13 +109,15 @@ gss_verify_mic_v1(struct krb5_ctx *ctx,if ((ptr[6 ] !=0xff ) || (ptr[7 ] !=0xff ))return GSS_S_DEFECTIVE_TOKEN ; -if (make_checksum ("md5" , ptr,8 , message_buffer,0 , &md5cksum)) +if (make_checksum ((char *)ctx->gk5e->cksum_name, ptr,8 , + message_buffer,0 , &md5cksum))return GSS_S_FAILURE ;if (krb5_encrypt (ctx->seq,NULL , md5cksum.data, md5cksum.data,16 ))return GSS_S_FAILURE ; -if (memcmp (md5cksum.data +8 , ptr +GSS_KRB5_TOK_HDR_LEN ,8 )) +if (memcmp (md5cksum.data +8 , ptr +GSS_KRB5_TOK_HDR_LEN , + ctx->gk5e->cksumlength))return GSS_S_BAD_SIG ;/* it got through unscathed. Make sure the context is unexpired */
net/sunrpc/auth_gss/gss_krb5_wrap.c +60 -19
154 lines not on this page · raw message
Signature · 1 line
1.6.6.1
Re: [PATCH 05/22] gss_krb5: introduce encryption type framework
Quoted 56 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
Add enctype framework and change functions to use the generic values from it rather than the values hard-coded for des.
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- include/linux/sunrpc/gss_krb5.h | 25 +++++++++- net/sunrpc/auth_gss/gss_krb5_crypto.c | 18 ++++---- net/sunrpc/auth_gss/gss_krb5_mech.c | 85 +++++++++++++++++++++++++++----- net/sunrpc/auth_gss/gss_krb5_seal.c | 49 ++++++++++++------- net/sunrpc/auth_gss/gss_krb5_unseal.c | 15 ++++-- net/sunrpc/auth_gss/gss_krb5_wrap.c | 79 +++++++++++++++++++++++------- 6 files changed, 203 insertions(+), 68 deletions(-)include/linux/sunrpc/gss_krb5.h +17
-1@@ -4,7 +4,7 @@* Adapted from MIT Kerberos 5-1.2.1 lib/include/krb5.h, * lib/gssapi/krb5/gssapiP_krb5.h, and others * -* Copyright (c) 2000 The Regents of the University of Michigan. +* Copyright (c) 2000-2008 The Regents of the University of Michigan. * All rights reserved. * * Andy Adamson <[email protected]> @@ -36,6 +36,7 @@* */ +#include <linux/crypto.h> #include <linux/sunrpc/auth_gss.h> #include <linux/sunrpc/gss_err.h> #include <linux/sunrpc/gss_asn1.h> @@ -46,9 +47,31 @@/* Maximum blocksize for the supported crypto algorithms */ #define GSS_KRB5_MAX_BLOCKSIZE (16) +struct gss_krb5_enctype { +const u32 etype;/* encryption (key) type */ +const u32 ctype;/* checksum type */ +const char *name;/* "friendly" name */ +const char *encrypt_name;/* crypto encrypt name */ +const char *cksum_name;/* crypto checksum name */ +const u16 signalg;/* signing algorithm */ +const u16 sealalg;/* sealing algorithm */ +const u32 blocksize;/* encryption blocksize */ +const u32 cksumlength;/* checksum length */ +const u32 keyed_cksum;/* is it a keyed cksum? */ +const u32 keybytes;/* raw key len, in bytes */ +const u32 keylength;/* final key len, in bytes */ + u32 (*encrypt) (struct crypto_blkcipher *tfm, + void *iv, void *in, void *out,
include/linux/sunrpc/gss_krb5.h line 74
Quoted 10 lines
include/linux/sunrpc/gss_krb5.h +7
-0+ int length); /* encryption function */ +u32 (*decrypt) (struct crypto_blkcipher *tfm, +void *iv,void *in,void *out, +int length);/* decryption function */ +}; +struct krb5_ctx {int initiate;/* 1 = initiating, 0 = accepting */ u32 enctype; +struct gss_krb5_enctype *gk5e;/* enctype-specific info */
^^^^^^^^
Should that be a 'const struct gss_krb5_enctype *'?
Quoted 98 lines
include/linux/sunrpc/gss_krb5.h +0
-0struct crypto_blkcipher *enc;struct crypto_blkcipher *seq;s32 endtime;net/sunrpc/auth_gss/gss_krb5_crypto.c +9
-9@@ -1,7 +1,7 @@/* * linux/net/sunrpc/gss_krb5_crypto.c * -* Copyright (c) 2000 The Regents of the University of Michigan. +* Copyright (c) 2000-2008 The Regents of the University of Michigan. * All rights reserved. * * Andy Adamson <[email protected]> @@ -59,13 +59,13 @@ krb5_encrypt( {u32 ret = -EINVAL ;struct scatterlist sg[1 ]; -u8 local_iv[16 ] = {0 }; +u8 local_iv[GSS_KRB5_MAX_BLOCKSIZE ] = {0 };struct blkcipher_desc desc = { .tfm = tfm, .info = local_iv };if (length %crypto_blkcipher_blocksize (tfm) !=0 ) goto out; -if (crypto_blkcipher_ivsize (tfm) >16 ) { +if (crypto_blkcipher_ivsize (tfm) >GSS_KRB5_MAX_BLOCKSIZE ) {dprintk ("RPC: gss_k5encrypt: tfm iv size too large %d\n" ,crypto_blkcipher_ivsize (tfm)); goto out;@@ -93,13 +93,13 @@ krb5_decrypt( {u32 ret = -EINVAL ;struct scatterlist sg[1 ]; -u8 local_iv[16 ] = {0 }; +u8 local_iv[GSS_KRB5_MAX_BLOCKSIZE ] = {0 };struct blkcipher_desc desc = { .tfm = tfm, .info = local_iv };if (length %crypto_blkcipher_blocksize (tfm) !=0 ) goto out; -if (crypto_blkcipher_ivsize (tfm) >16 ) { +if (crypto_blkcipher_ivsize (tfm) >GSS_KRB5_MAX_BLOCKSIZE ) {dprintk ("RPC: gss_k5decrypt: tfm iv size too large %d\n" ,crypto_blkcipher_ivsize (tfm)); goto out;@@ -158,7 +158,7 @@ out: }struct encryptor_desc { -u8 iv[8 ];/* XXX hard-coded blocksize */ +u8 iv[GSS_KRB5_MAX_BLOCKSIZE ];struct blkcipher_desc desc;int pos;struct xdr_buf *outbuf;@@ -199,7 +199,7 @@ encryptor(struct scatterlist *sg, void *data) desc->fraglen += sg->length; desc->pos += sg->length; - fraglen = thislen &7 ;/* XXX hardcoded blocksize */ + fraglen = thislen & (crypto_blkcipher_blocksize (desc->desc.tfm) -1 ); thislen -= fraglen;if (thislen ==0 )@@ -257,7 +257,7 @@ gss_encrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *buf, }struct decryptor_desc { -u8 iv[8 ];/* XXX hard-coded blocksize */ +u8 iv[GSS_KRB5_MAX_BLOCKSIZE ];struct blkcipher_desc desc;struct scatterlist frags[4 ];int fragno;@@ -279,7 +279,7 @@ decryptor(struct scatterlist *sg, void *data) desc->fragno++; desc->fraglen += sg->length; - fraglen = thislen &7 ;/* XXX hardcoded blocksize */ + fraglen = thislen & (crypto_blkcipher_blocksize (desc->desc.tfm) -1 ); thislen -= fraglen;if (thislen ==0 )net/sunrpc/auth_gss/gss_krb5_mech.c +1
-1@@ -1,7 +1,7 @@/* * linux/net/sunrpc/gss_krb5_mech.c * -* Copyright (c) 2001 The Regents of the University of Michigan. +* Copyright (c) 2001-2008 The Regents of the University of Michigan. * All rights reserved. * * Andy Adamson <[email protected]>
net/sunrpc/auth_gss/gss_krb5_mech.c line 51
Quoted 4 lines
net/sunrpc/auth_gss/gss_krb5_mech.c +1
-0@@ -48,6 +48,49 @@# define RPCDBG_FACILITY RPCDBG_AUTH#endif +static struct gss_krb5_enctype supported_gss_krb5_enctypes[] = {
static const.... ?
Quoted 11 lines
net/sunrpc/auth_gss/gss_krb5_mech.c +11
-0+/* +* DES (All DES enctypes are mapped to the same gss functionality) +*/ + { + .etype = ENCTYPE_DES_CBC_RAW, + .ctype = CKSUMTYPE_RSA_MD5, + .name = "des-cbc-crc", + .encrypt_name = "cbc(des)", + .cksum_name = "md5", + .encrypt = krb5_encrypt, + .decrypt = krb5_decrypt,
net/sunrpc/auth_gss/gss_krb5_mech.c line 72
Quoted 10 lines
net/sunrpc/auth_gss/gss_krb5_mech.c +10
-0+ .signalg = SGN_ALG_DES_MAC_MD5, + .sealalg = SEAL_ALG_DES, + .keybytes = 7, + .keylength = 8, + .blocksize = 8, + .cksumlength = 8, + }, +}; + +static int num_supported_enctypes =ARRAY_SIZE (supported_gss_krb5_enctypes);
const...
Quoted 24 lines
net/sunrpc/auth_gss/gss_krb5_mech.c +21
-0+ +static int +supported_gss_krb5_enctype (int etype) +{ +int i; +for (i =0 ; i < num_supported_enctypes; i++) +if (supported_gss_krb5_enctypes[i].etype == etype) +return 1 ; +return 0 ; +} + +static struct gss_krb5_enctype * +get_gss_krb5_enctype (int etype) +{ +int i; +for (i =0 ; i < num_supported_enctypes; i++) +if (supported_gss_krb5_enctypes[i].etype == etype) +return &supported_gss_krb5_enctypes[i]; +return NULL ; +} +static const void *simple_get_bytes (const void *p,const void *end,void *res,int len) {
PATCH 6/22 gss_krb5: add ability to have a keyed checksum (hmac)
In reply to [email protected]From: Kevin Coffman <[email protected]>
Encryption types besides DES may use a keyed checksum (hmac). Modify the make_checksum() function to allow for a key and take care of enctype-specific processing such as truncating the resulting hash.
--- include/linux/sunrpc/gss_krb5.h | 11 +++++-- net/sunrpc/auth_gss/gss_krb5_crypto.c | 54 ++++++++++++++++++++++++++++----- net/sunrpc/auth_gss/gss_krb5_mech.c | 1 + net/sunrpc/auth_gss/gss_krb5_seal.c | 13 ++++---- net/sunrpc/auth_gss/gss_krb5_unseal.c | 13 +++++--- net/sunrpc/auth_gss/gss_krb5_wrap.c | 30 +++++++++++------- 6 files changed, 88 insertions(+), 34 deletions(-)
include/linux/sunrpc/gss_krb5.h +8 -3
@@ -41,6 +41,9 @@#include <linux/sunrpc/gss_err.h> #include <linux/sunrpc/gss_asn1.h> +/* Maximum key length (in bytes) for the supported crypto algorithms*/ +#define GSS_KRB5_MAX_KEYLEN (32) +/* Maximum checksum function output for the supported crypto algorithms */ #define GSS_KRB5_MAX_CKSUM_LEN (20)
@@ -74,6 +77,7 @@ struct krb5_ctx {struct gss_krb5_enctype *gk5e;/* enctype-specific info */ struct crypto_blkcipher *enc;struct crypto_blkcipher *seq; +u8 cksum[GSS_KRB5_MAX_KEYLEN ];s32 endtime;u32 seq_send;struct xdr_netobj mech_used;
@@ -159,9 +163,10 @@ enum seal_alg { + GSS_KRB5_TOK_HDR_LEN \ + GSS_KRB5_MAX_CKSUM_LEN > RPC_MAX_AUTH_SIZE) -s32 -make_checksum (char *,char *header,int hdrlen,struct xdr_buf *body, -int body_offset,struct xdr_netobj *cksum); +u32 +make_checksum (struct krb5_ctx *kctx,char *header,int hdrlen, +struct xdr_buf *body,int body_offset,u8 *cksumkey, +struct xdr_netobj *cksumout);u32 gss_get_mic_kerberos (struct gss_ctx *,struct xdr_buf *,struct xdr_netobj *);
net/sunrpc/auth_gss/gss_krb5_crypto.c +46 -8
75 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_mech.c +1 -0
@@ -66,6 +66,7 @@ static struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { .keylength = 8, .blocksize = 8, .cksumlength = 8, + .keyed_cksum = 0, }, };
net/sunrpc/auth_gss/gss_krb5_seal.c +7 -6
@@ -102,6 +102,7 @@ gss_get_mic_v1(struct krb5_ctx *ctx, struct xdr_buf *text,void *ptr;s32 now;u32 seq_send; +u8 *cksumkey;dprintk ("RPC: %s\n" , __func__);BUG_ON (ctx ==NULL );
@@ -110,15 +111,15 @@ gss_get_mic_v1(struct krb5_ctx *ctx, struct xdr_buf *text, ptr =setup_token (ctx, token); -if (make_checksum ((char *)ctx->gk5e->cksum_name, ptr,8 , - text,0 , &md5cksum)) -return GSS_S_FAILURE ; +if (ctx->gk5e->keyed_cksum) + cksumkey = ctx->cksum; +else + cksumkey =NULL ; -if (krb5_encrypt (ctx->seq,NULL , md5cksum.data, - md5cksum.data, md5cksum.len)) +if (make_checksum (ctx, ptr,8 , text,0 , cksumkey, &md5cksum))return GSS_S_FAILURE ; -memcpy (ptr +GSS_KRB5_TOK_HDR_LEN , md5cksum.data + md5cksum.len -8 ,8 ); +memcpy (ptr +GSS_KRB5_TOK_HDR_LEN , md5cksum.data, md5cksum.len);spin_lock (&krb5_seq_lock); seq_send = ctx->seq_send++;
net/sunrpc/auth_gss/gss_krb5_unseal.c +8 -5
@@ -85,6 +85,7 @@ gss_verify_mic_v1(struct krb5_ctx *ctx,u32 seqnum;unsigned char *ptr = (unsigned char *)read_token->data;int bodysize; +u8 *cksumkey;dprintk ("RPC: krb5_read_token\n" );
@@ -109,14 +110,16 @@ gss_verify_mic_v1(struct krb5_ctx *ctx,if ((ptr[6 ] !=0xff ) || (ptr[7 ] !=0xff ))return GSS_S_DEFECTIVE_TOKEN ; -if (make_checksum ((char *)ctx->gk5e->cksum_name, ptr,8 , - message_buffer,0 , &md5cksum)) -return GSS_S_FAILURE ; +if (ctx->gk5e->keyed_cksum) + cksumkey = ctx->cksum; +else + cksumkey =NULL ; -if (krb5_encrypt (ctx->seq,NULL , md5cksum.data, md5cksum.data,16 )) +if (make_checksum (ctx, ptr,8 , message_buffer,0 , + cksumkey, &md5cksum))return GSS_S_FAILURE ; -if (memcmp (md5cksum.data +8 , ptr +GSS_KRB5_TOK_HDR_LEN , +if (memcmp (md5cksum.data, ptr +GSS_KRB5_TOK_HDR_LEN , ctx->gk5e->cksumlength))return GSS_S_BAD_SIG ;
net/sunrpc/auth_gss/gss_krb5_wrap.c +18 -12
@@ -168,6 +168,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,int headlen;struct page **tmp_pages;u32 seq_send; +u8 *cksumkey;dprintk ("RPC: %s\n" , __func__);
@@ -207,18 +208,20 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,make_confounder (msg_start, blocksize); +if (kctx->gk5e->keyed_cksum) + cksumkey = kctx->cksum; +else + cksumkey =NULL ; +/* XXXJBF: UGH!: */ tmp_pages = buf->pages; buf->pages = pages; -if (make_checksum ((char *)kctx->gk5e->cksum_name, ptr,8 , buf, - offset + headlen - blocksize, &md5cksum)) +if (make_checksum (kctx, ptr,8 , buf, offset + headlen - blocksize, + cksumkey, &md5cksum))return GSS_S_FAILURE ; buf->pages = tmp_pages; -if (krb5_encrypt (kctx->seq,NULL , md5cksum.data, - md5cksum.data, md5cksum.len)) -return GSS_S_FAILURE ; -memcpy (ptr +GSS_KRB5_TOK_HDR_LEN , md5cksum.data + md5cksum.len -8 ,8 ); +memcpy (ptr +GSS_KRB5_TOK_HDR_LEN , md5cksum.data, md5cksum.len);spin_lock (&krb5_seq_lock); seq_send = kctx->seq_send++;
@@ -254,6 +257,7 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)int data_len;int blocksize;int crypt_offset; +u8 *cksumkey;dprintk ("RPC: gss_unwrap_kerberos\n" );
@@ -290,15 +294,17 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)if (gss_decrypt_xdr_buf (kctx->enc, buf, crypt_offset))return GSS_S_DEFECTIVE_TOKEN ; -if (make_checksum ((char *)kctx->gk5e->cksum_name, ptr,8 , buf, - crypt_offset, &md5cksum)) -return GSS_S_FAILURE ; +if (kctx->gk5e->keyed_cksum) + cksumkey = kctx->cksum; +else + cksumkey =NULL ; -if (krb5_encrypt (kctx->seq,NULL , md5cksum.data, - md5cksum.data, md5cksum.len)) +if (make_checksum (kctx, ptr,8 , buf, crypt_offset, + cksumkey, &md5cksum))return GSS_S_FAILURE ; -if (memcmp (md5cksum.data +8 , ptr +GSS_KRB5_TOK_HDR_LEN ,8 )) +if (memcmp (md5cksum.data, ptr +GSS_KRB5_TOK_HDR_LEN , + kctx->gk5e->cksumlength))return GSS_S_BAD_SIG ;/* it got through unscathed. Make sure the context is unexpired */
Signature · 1 line
1.6.6.1
PATCH 7/22 gss_krb5: import functionality to derive keys into the kernel
In reply to [email protected]From: Kevin Coffman <[email protected]>
Import the code to derive Kerberos keys from a base key into the kernel. This will allow us to change the format of the context information sent down from gssd to include only a single key.
--- include/linux/sunrpc/gss_krb5.h | 31 +++++ net/sunrpc/auth_gss/Makefile | 2 +- net/sunrpc/auth_gss/gss_krb5_keys.c | 252 +++++++++++++++++++++++++++++++++++ net/sunrpc/auth_gss/gss_krb5_mech.c | 1 + 4 files changed, 285 insertions(+), 1 deletions(-) create mode 100644 net/sunrpc/auth_gss/gss_krb5_keys.c
include/linux/sunrpc/gss_krb5.h +31 -0
@@ -41,6 +41,9 @@#include <linux/sunrpc/gss_err.h> #include <linux/sunrpc/gss_asn1.h> +/* Length of constant used in key derivation */ +#define GSS_KRB5_K5CLENGTH (5) +/* Maximum key length (in bytes) for the supported crypto algorithms*/ #define GSS_KRB5_MAX_KEYLEN (32)
@@ -69,6 +72,9 @@ struct gss_krb5_enctype {u32 (*decrypt) (struct crypto_blkcipher *tfm,void *iv,void *in,void *out,int length);/* decryption function */ +u32 (*mk_key) (struct gss_krb5_enctype *gk5e, +struct xdr_netobj *in, +struct xdr_netobj *out);/* complete key generation */ };struct krb5_ctx {
@@ -148,6 +154,25 @@ enum seal_alg {#define ENCTYPE_UNKNOWN 0x01ff/* +* Constants used for key derivation +*/ +/* for 3DES */ +#define KG_USAGE_SEAL (22) +#define KG_USAGE_SIGN (23) +#define KG_USAGE_SEQ (24) + +/* from rfc3961 */ +#define KEY_USAGE_SEED_CHECKSUM (0x99) +#define KEY_USAGE_SEED_ENCRYPTION (0xAA) +#define KEY_USAGE_SEED_INTEGRITY (0x55) + +/* from rfc4121 */ +#define KG_USAGE_ACCEPTOR_SEAL (22) +#define KG_USAGE_ACCEPTOR_SIGN (23) +#define KG_USAGE_INITIATOR_SEAL (24) +#define KG_USAGE_INITIATOR_SIGN (25) + +/* * This compile-time check verifies that we will not exceed the * slack space allotted by the client and server auth_gss code * before they call gss_wrap().
@@ -211,3 +236,9 @@ krb5_get_seq_num(struct crypto_blkcipher *key,int shift_head_data (struct xdr_buf *buf,unsigned int base,unsigned int shiftlen); + +u32 +krb5_derive_key (struct gss_krb5_enctype *gk5e, +const struct xdr_netobj *inkey, +struct xdr_netobj *outkey, +const struct xdr_netobj *in_constant);
net/sunrpc/auth_gss/Makefile +1 -1
@@ -10,7 +10,7 @@ auth_rpcgss-objs := auth_gss.o gss_generic_token.o \ obj-$(CONFIG_RPCSEC_GSS_KRB5) += rpcsec_gss_krb5.o rpcsec_gss_krb5-objs := gss_krb5_mech.o gss_krb5_seal.o gss_krb5_unseal.o \ - gss_krb5_seqnum.o gss_krb5_wrap.o gss_krb5_crypto.o + gss_krb5_seqnum.o gss_krb5_wrap.o gss_krb5_crypto.o gss_krb5_keys.o obj-$(CONFIG_RPCSEC_GSS_SPKM3) += rpcsec_gss_spkm3.o
net/sunrpc/auth_gss/gss_krb5_keys.c new file +252 -0
252 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_mech.c +1 -0
@@ -60,6 +60,7 @@ static struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { .cksum_name = "md5", .encrypt = krb5_encrypt, .decrypt = krb5_decrypt, + .mk_key = NULL, .signalg = SGN_ALG_DES_MAC_MD5, .sealalg = SEAL_ALG_DES, .keybytes = 7,
Signature · 1 line
1.6.6.1
PATCH 8/22 gss_krb5: handle new context format from gssd
In reply to [email protected]From: Kevin Coffman <[email protected]>
For encryption types other than DES, gssd sends down context information in a new format. This new format includes the information needed to support the new Kerberos GSS-API tokens defined in rfc4121.
--- include/linux/sunrpc/gss_krb5.h | 19 +++ net/sunrpc/auth_gss/gss_krb5_mech.c | 237 ++++++++++++++++++++++++++++++++++- 2 files changed, 255 insertions(+), 1 deletions(-)
include/linux/sunrpc/gss_krb5.h +19 -0
@@ -77,16 +77,31 @@ struct gss_krb5_enctype { struct xdr_netobj *out); /* complete key generation */ }; +/* krb5_ctx flags definitions */ +#define KRB5_CTX_FLAG_INITIATOR 0x00000001 +#define KRB5_CTX_FLAG_CFX 0x00000002 +#define KRB5_CTX_FLAG_ACCEPTOR_SUBKEY 0x00000004 +struct krb5_ctx {int initiate;/* 1 = initiating, 0 = accepting */ u32 enctype; +u32 flags;struct gss_krb5_enctype *gk5e;/* enctype-specific info */ struct crypto_blkcipher *enc;struct crypto_blkcipher *seq; +struct crypto_blkcipher *acceptor_enc; +struct crypto_blkcipher *initiator_enc;u8 cksum[GSS_KRB5_MAX_KEYLEN ];s32 endtime;u32 seq_send; +u64 seq_send64;struct xdr_netobj mech_used; +u8 initiator_sign[GSS_KRB5_MAX_KEYLEN ]; +u8 acceptor_sign[GSS_KRB5_MAX_KEYLEN ]; +u8 initiator_seal[GSS_KRB5_MAX_KEYLEN ]; +u8 acceptor_seal[GSS_KRB5_MAX_KEYLEN ]; +u8 initiator_integ[GSS_KRB5_MAX_KEYLEN ]; +u8 acceptor_integ[GSS_KRB5_MAX_KEYLEN ]; };extern spinlock_t krb5_seq_lock;
@@ -151,6 +166,10 @@ enum seal_alg {#define ENCTYPE_DES3_CBC_RAW 0x0006/* DES-3 cbc mode raw */ #define ENCTYPE_DES_HMAC_SHA1 0x0008#define ENCTYPE_DES3_CBC_SHA1 0x0010 +#define ENCTYPE_AES128_CTS_HMAC_SHA1_96 0x0011 +#define ENCTYPE_AES256_CTS_HMAC_SHA1_96 0x0012 +#define ENCTYPE_ARCFOUR_HMAC 0x0017 +#define ENCTYPE_ARCFOUR_HMAC_EXP 0x0018#define ENCTYPE_UNKNOWN 0x01ff/*
net/sunrpc/auth_gss/gss_krb5_mech.c +236 -1
261 lines not on this page · raw message
Signature · 1 line
1.6.6.1
PATCH 9/22 gss_krb5: add support for triple-des encryption
In reply to [email protected]From: Kevin Coffman <[email protected]>
Add the final pieces to support the triple-des encryption type.
--- include/linux/sunrpc/gss_krb5.h | 5 +++ net/sunrpc/auth_gss/gss_krb5_crypto.c | 3 ++ net/sunrpc/auth_gss/gss_krb5_keys.c | 53 +++++++++++++++++++++++++++++++++ net/sunrpc/auth_gss/gss_krb5_mech.c | 23 ++++++++++++++ net/sunrpc/auth_gss/gss_krb5_seal.c | 1 + net/sunrpc/auth_gss/gss_krb5_unseal.c | 1 + net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 + 7 files changed, 88 insertions(+), 0 deletions(-)
include/linux/sunrpc/gss_krb5.h +5 -0
@@ -261,3 +261,8 @@ krb5_derive_key(struct gss_krb5_enctype *gk5e,const struct xdr_netobj *inkey, struct xdr_netobj *outkey, const struct xdr_netobj *in_constant); + +u32 +gss_krb5_des3_make_key (struct gss_krb5_enctype *gk5e, +struct xdr_netobj *randombits, +struct xdr_netobj *key);
net/sunrpc/auth_gss/gss_krb5_crypto.c +3 -0
@@ -185,6 +185,9 @@ make_checksum(struct krb5_ctx *kctx, char *header, int hdrlen, checksumdata + checksumlen - kctx->gk5e->cksumlength, kctx->gk5e->cksumlength);break ; +case CKSUMTYPE_HMAC_SHA1_DES3 : +memcpy (cksumout->data, checksumdata, kctx->gk5e->cksumlength); +break ;default :BUG ();break ;
net/sunrpc/auth_gss/gss_krb5_keys.c +53 -0
56 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_mech.c +23 -0
@@ -71,6 +71,26 @@ static struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { .cksumlength = 8, .keyed_cksum = 0, }, +/* +* 3DES +*/ + { + .etype = ENCTYPE_DES3_CBC_RAW, + .ctype = CKSUMTYPE_HMAC_SHA1_DES3, + .name = "des3-hmac-sha1", + .encrypt_name = "cbc(des3_ede)", + .cksum_name = "hmac(sha1)", + .encrypt = krb5_encrypt, + .decrypt = krb5_decrypt, + .mk_key = gss_krb5_des3_make_key, + .signalg = SGN_ALG_HMAC_SHA1_DES3_KD, + .sealalg = SEAL_ALG_DES3KD, + .keybytes = 21, + .keylength = 24, + .blocksize = 8, + .cksumlength = 20, + .keyed_cksum = 1, + }, };static int num_supported_enctypes =ARRAY_SIZE (supported_gss_krb5_enctypes);
@@ -446,6 +466,9 @@ gss_import_v2_context(const void *p, const void *end, struct krb5_ctx *ctx) p =simple_get_bytes (p, end, &ctx->enctype,sizeof (ctx->enctype));if (IS_ERR (p)) goto out_err; +/* Map ENCTYPE_DES3_CBC_SHA1 to ENCTYPE_DES3_CBC_RAW */ +if (ctx->enctype ==ENCTYPE_DES3_CBC_SHA1 ) + ctx->enctype =ENCTYPE_DES3_CBC_RAW ; ctx->gk5e =get_gss_krb5_enctype (ctx->enctype);if (ctx->gk5e ==NULL ) { printk("gss_kerberos_mech: unsupported krb5 enctype %u\n",
net/sunrpc/auth_gss/gss_krb5_seal.c +1 -0
@@ -143,6 +143,7 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,default :BUG ();case ENCTYPE_DES_CBC_RAW : +case ENCTYPE_DES3_CBC_RAW :return gss_get_mic_v1 (ctx, text, token); } }
net/sunrpc/auth_gss/gss_krb5_unseal.c +1 -0
@@ -153,6 +153,7 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,default :BUG ();case ENCTYPE_DES_CBC_RAW : +case ENCTYPE_DES3_CBC_RAW :return gss_verify_mic_v1 (ctx, message_buffer, read_token); } }
net/sunrpc/auth_gss/gss_krb5_wrap.c +2 -0
@@ -352,6 +352,7 @@ gss_wrap_kerberos(struct gss_ctx *gctx, int offset,default :BUG ();case ENCTYPE_DES_CBC_RAW : +case ENCTYPE_DES3_CBC_RAW :return gss_wrap_kerberos_v1 (kctx, offset, buf, pages); } }
@@ -365,6 +366,7 @@ gss_unwrap_kerberos(struct gss_ctx *gctx, int offset, struct xdr_buf *buf)default :BUG ();case ENCTYPE_DES_CBC_RAW : +case ENCTYPE_DES3_CBC_RAW :return gss_unwrap_kerberos_v1 (kctx, offset, buf); } }
Signature · 1 line
1.6.6.1
PATCH 10/22 Add new pipefs file indicating which Kerberos enctypes the kernel supports
In reply to [email protected]From: Kevin Coffman <[email protected]>
New file, krb5_info, indicates which Kerberos encryption types are supported by the kernel rpcsecgss code. This is used by gssd to determine which encryption types it should attempt to negotiate when creating a context with a server.
The server principal's database and keytab encryption types are what limits what it should negotiate. Therefore, its keytab should be created with only the enctypes listed by this file.
From: J. Bruce Fields <[email protected]>
--- net/sunrpc/rpc_pipe.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)
net/sunrpc/rpc_pipe.c +31 -0
@@ -397,6 +397,31 @@ static const struct file_operations rpc_info_operations = { .release = rpc_info_release, }; +/* +* This really belongs in the gss_krb5 code, +* but the info file logically belongs here +*/ +static int +rpc_show_krb5_info (struct seq_file *m,void *v) +{ +seq_printf (m,"enctypes: 3,1,2\n" ); +return 0 ; +} + +static int +rpc_krb5_info_open (struct inode *inode,struct file *file) +{ +return single_open (file, rpc_show_krb5_info,NULL ); +} + +static struct file_operations krb5_info_operations = { + .owner =THIS_MODULE , + .open = rpc_krb5_info_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +/* * Description of fs contents.
@@ -949,6 +974,7 @@ enum { RPCAUTH_portmap, RPCAUTH_statd, RPCAUTH_nfsd4_cb, + RPCAUTH_krb5_info, RPCAUTH_cache, RPCAUTH_RootEOF };
@@ -982,6 +1008,11 @@ static const struct rpc_filelist files[] = { .name = "cache", .mode = S_IFDIR | S_IRUGO | S_IXUGO, }, + [RPCAUTH_krb5_info] = { + .name = "krb5_info", + .i_fop = &krb5_info_operations, + .mode = S_IFREG | S_IRUSR, + }, }; static int
Signature · 1 line
1.6.6.1
Re: [PATCH 10/22] Add new pipefs file indicating which Kerberos enctypes the kernel supports
Quoted 23 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
New file,
krb5_info, indicates which Kerberos encryption types are supported by the kernel rpcsecgss code. This is used by gssd to determine which encryption types it should attempt to negotiate when creating a context with a server.The server principal's database and keytab encryption types are what limits what it should negotiate. Therefore, its keytab should be created with only the enctypes listed by this file.
From: J. Bruce Fields <[email protected]>
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- net/sunrpc/rpc_pipe.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)net/sunrpc/rpc_pipe.c +0
-0
net/sunrpc/rpc_pipe.c static const struct file_operations rpc_info_operations = { · line 403
Quoted 7 lines
net/sunrpc/rpc_pipe.c +4
-0@@ -397,6 +397,31 @@ static const struct file_operations rpc_info_operations = { .release = rpc_info_release, }; +/* +* This really belongs in the gss_krb5 code, +* but the info file logically belongs here +*/
No. We should rather export __rpc_create() to allow this code to be moved to the gss_krb5 module.
A message that is not in the archive (sent off-list or not yet received): 1268670503.2993.103.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]
Re: [PATCH 10/22] Add new pipefs file indicating which Kerberos enctypes the kernel supports
Quoted 2 lines · Trond Myklebust
No. We should rather export
__rpc_create()to allow this code to be moved to thegss_krb5module.
Careful with that... There's a bunch of sanitizing to do in rpc_pipe and exporting its guts wouldn't be a good idea ATM...
Re: [PATCH 10/22] Add new pipefs file indicating which Kerberos enctypes the kernel supports
In reply to [email protected]Quoted 24 lines · On Mon, Mar 15, 2010 at 08:20:15AM -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
New file,
krb5_info, indicates which Kerberos encryption types are supported by the kernel rpcsecgss code. This is used by gssd to determine which encryption types it should attempt to negotiate when creating a context with a server.The server principal's database and keytab encryption types are what limits what it should negotiate. Therefore, its keytab should be created with only the enctypes listed by this file.
From: J. Bruce Fields <[email protected]>
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- net/sunrpc/rpc_pipe.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-)net/sunrpc/rpc_pipe.c +0
-0@@ -397,6 +397,31 @@ static const struct file_operations rpc_info_operations = { .release = rpc_info_release,
net/sunrpc/rpc_pipe.c static const struct file_operations rpc_info_operations = { · line 407
Quoted 10 lines
net/sunrpc/rpc_pipe.c +8
-0}; +/* +* This really belongs in the gss_krb5 code, +* but the info file logically belongs here +*/ +static int +rpc_show_krb5_info (struct seq_file *m,void *v) +{ +seq_printf (m,"enctypes: 3,1,2\n" );
There was originally some idea we should move this to the upcall itself (so just add "enctypes=3,1,2" to the upcall).
But actually as long as it's not really per-upcall information, I think it makes sense to leave it in a krb5_info file like this.
--b.
Quoted 47 lines
net/sunrpc/rpc_pipe.c +23
-0+return 0 ; +} + +static int +rpc_krb5_info_open (struct inode *inode,struct file *file) +{ +return single_open (file, rpc_show_krb5_info,NULL ); +} + +static struct file_operations krb5_info_operations = { + .owner =THIS_MODULE , + .open = rpc_krb5_info_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +/* * Description of fs contents. @@ -949,6 +974,7 @@ enum { RPCAUTH_portmap, RPCAUTH_statd, RPCAUTH_nfsd4_cb, + RPCAUTH_krb5_info, RPCAUTH_cache, RPCAUTH_RootEOF };@@ -982,6 +1008,11 @@ static const struct rpc_filelist files[] = { .name = "cache", .mode = S_IFDIR | S_IRUGO | S_IXUGO, }, + [RPCAUTH_krb5_info] = { + .name = "krb5_info", + .i_fop = &krb5_info_operations, + .mode = S_IFREG | S_IRUSR, + }, }; static intSignature · 6 lines
1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 11/22 Update pipefs file indicating which Kerberos enctypes the kernel supports
In reply to [email protected]From: Kevin Coffman <[email protected]>
--- net/sunrpc/rpc_pipe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/sunrpc/rpc_pipe.c +1 -1
@@ -404,7 +404,7 @@ static const struct file_operations rpc_info_operations = {static int rpc_show_krb5_info (struct seq_file *m,void *v) { -seq_printf (m,"enctypes: 3,1,2\n" ); +seq_printf (m,"enctypes: 16,3,1,2\n" );return 0 ; }
Signature · 1 line
1.6.6.1
PATCH 12/22 xdr: Add an export for the helper function write_bytes_to_xdr_buf()
In reply to [email protected]From: Kevin Coffman <[email protected]>
--- net/sunrpc/xdr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
net/sunrpc/xdr.c +1 -0
@@ -761,6 +761,7 @@ int write_bytes_to_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, un__write_bytes_to_xdr_buf (&subbuf, obj, len);return 0 ; } +EXPORT_SYMBOL (write_bytes_to_xdr_buf);int xdr_decode_word (struct xdr_buf *buf,unsigned int base,u32 *obj)
Signature · 1 line
1.6.6.1
Re: [PATCH 12/22] xdr: Add an export for the helper function write_bytes_to_xdr_buf()
Quoted 13 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- net/sunrpc/xdr.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)net/sunrpc/xdr.c +0
-0
net/sunrpc/xdr.c int write_bytes_to_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, un · line 765
Quoted 5 lines
net/sunrpc/xdr.c +1
-0@@ -761,6 +761,7 @@ int write_bytes_to_xdr_buf(struct xdr_buf *buf, unsigned int base, void *obj, un__write_bytes_to_xdr_buf (&subbuf, obj, len);return 0 ; } +EXPORT_SYMBOL (write_bytes_to_xdr_buf);
EXPORT_SYMBOL_GPL please
PATCH 13/22 gss_krb5: add support for new token formats in rfc4121
In reply to [email protected]From: Kevin Coffman <[email protected]>
This is a step toward support for AES encryption types which are required to use the new token formats defined in rfc4121.
--- include/linux/sunrpc/gss_krb5.h | 28 ++++ net/sunrpc/auth_gss/gss_krb5_crypto.c | 74 ++++++++++ net/sunrpc/auth_gss/gss_krb5_seal.c | 70 +++++++++ net/sunrpc/auth_gss/gss_krb5_unseal.c | 61 ++++++++ net/sunrpc/auth_gss/gss_krb5_wrap.c | 247 +++++++++++++++++++++++++++++++++ 5 files changed, 480 insertions(+), 0 deletions(-)
include/linux/sunrpc/gss_krb5.h +28 -0
@@ -53,6 +53,8 @@/* Maximum blocksize for the supported crypto algorithms */ #define GSS_KRB5_MAX_BLOCKSIZE (16) +struct krb5_ctx ; +struct gss_krb5_enctype {const u32 etype;/* encryption (key) type */ const u32 ctype;/* checksum type */
@@ -75,6 +77,12 @@ struct gss_krb5_enctype {u32 (*mk_key) (struct gss_krb5_enctype *gk5e,struct xdr_netobj *in,struct xdr_netobj *out);/* complete key generation */ +u32 (*encrypt_v2) (struct krb5_ctx *kctx,u32 offset, +struct xdr_buf *buf,int ec, +struct page **pages);/* v2 encryption function */ +u32 (*decrypt_v2) (struct krb5_ctx *kctx,u32 offset, +struct xdr_buf *buf,u32 *headskip, +u32 *tailskip);/* v2 decryption function */ };/* krb5_ctx flags definitions */
@@ -112,6 +120,18 @@ extern spinlock_t krb5_seq_lock;#define KG_TOK_MIC_MSG 0x0101#define KG_TOK_WRAP_MSG 0x0201 +#define KG2_TOK_INITIAL 0x0101 +#define KG2_TOK_RESPONSE 0x0202 +#define KG2_TOK_MIC 0x0404 +#define KG2_TOK_WRAP 0x0504 + +#define KG2_TOKEN_FLAG_SENTBYACCEPTOR 0x01 +#define KG2_TOKEN_FLAG_SEALED 0x02 +#define KG2_TOKEN_FLAG_ACCEPTORSUBKEY 0x04 + +#define KG2_RESP_FLAG_ERROR 0x0001 +#define KG2_RESP_FLAG_DELEG_OK 0x0002 +enum sgn_alg {SGN_ALG_DES_MAC_MD5 =0x0000 ,SGN_ALG_MD2_5 =0x0001 ,
@@ -136,6 +156,9 @@ enum seal_alg {#define CKSUMTYPE_RSA_MD5_DES 0x0008#define CKSUMTYPE_NIST_SHA 0x0009#define CKSUMTYPE_HMAC_SHA1_DES3 0x000c +#define CKSUMTYPE_HMAC_SHA1_96_AES128 0x000f +#define CKSUMTYPE_HMAC_SHA1_96_AES256 0x0010 +#define CKSUMTYPE_HMAC_MD5_ARCFOUR -138/* Microsoft md5 hmac cksumtype */ /* from gssapi_err_krb5.h */ #define KG_CCACHE_NOMATCH (39756032L)
@@ -212,6 +235,11 @@ make_checksum(struct krb5_ctx *kctx, char *header, int hdrlen, struct xdr_buf *body, int body_offset, u8 *cksumkey, struct xdr_netobj *cksumout); +u32 +make_checksum_v2 (struct krb5_ctx *,char *header,int hdrlen, +struct xdr_buf *body,int body_offset,u8 *key, +struct xdr_netobj *cksum); +u32 gss_get_mic_kerberos (struct gss_ctx *,struct xdr_buf *,struct xdr_netobj *);
net/sunrpc/auth_gss/gss_krb5_crypto.c +74 -0
80 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_seal.c +70 -0
88 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_unseal.c +61 -0
73 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_wrap.c +247 -0
265 lines not on this page · raw message
Signature · 1 line
1.6.6.1
Re: [PATCH 13/22] gss_krb5: add support for new token formats in rfc4121
Quoted 93 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
This is a step toward support for AES encryption types which are required to use the new token formats defined in rfc4121.
Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- include/linux/sunrpc/gss_krb5.h | 28 ++++ net/sunrpc/auth_gss/gss_krb5_crypto.c | 74 ++++++++++ net/sunrpc/auth_gss/gss_krb5_seal.c | 70 +++++++++ net/sunrpc/auth_gss/gss_krb5_unseal.c | 61 ++++++++ net/sunrpc/auth_gss/gss_krb5_wrap.c | 247 +++++++++++++++++++++++++++++++++ 5 files changed, 480 insertions(+), 0 deletions(-)include/linux/sunrpc/gss_krb5.h +28
-0@@ -53,6 +53,8 @@/* Maximum blocksize for the supported crypto algorithms */ #define GSS_KRB5_MAX_BLOCKSIZE (16) +struct krb5_ctx ; +struct gss_krb5_enctype {const u32 etype;/* encryption (key) type */ const u32 ctype;/* checksum type */ @@ -75,6 +77,12 @@ struct gss_krb5_enctype {u32 (*mk_key) (struct gss_krb5_enctype *gk5e,struct xdr_netobj *in,struct xdr_netobj *out);/* complete key generation */ +u32 (*encrypt_v2) (struct krb5_ctx *kctx,u32 offset, +struct xdr_buf *buf,int ec, +struct page **pages);/* v2 encryption function */ +u32 (*decrypt_v2) (struct krb5_ctx *kctx,u32 offset, +struct xdr_buf *buf,u32 *headskip, +u32 *tailskip);/* v2 decryption function */ };/* krb5_ctx flags definitions */ @@ -112,6 +120,18 @@ extern spinlock_t krb5_seq_lock;#define KG_TOK_MIC_MSG 0x0101#define KG_TOK_WRAP_MSG 0x0201 +#define KG2_TOK_INITIAL 0x0101 +#define KG2_TOK_RESPONSE 0x0202 +#define KG2_TOK_MIC 0x0404 +#define KG2_TOK_WRAP 0x0504 + +#define KG2_TOKEN_FLAG_SENTBYACCEPTOR 0x01 +#define KG2_TOKEN_FLAG_SEALED 0x02 +#define KG2_TOKEN_FLAG_ACCEPTORSUBKEY 0x04 + +#define KG2_RESP_FLAG_ERROR 0x0001 +#define KG2_RESP_FLAG_DELEG_OK 0x0002 +enum sgn_alg {SGN_ALG_DES_MAC_MD5 =0x0000 ,SGN_ALG_MD2_5 =0x0001 ,@@ -136,6 +156,9 @@ enum seal_alg {#define CKSUMTYPE_RSA_MD5_DES 0x0008#define CKSUMTYPE_NIST_SHA 0x0009#define CKSUMTYPE_HMAC_SHA1_DES3 0x000c +#define CKSUMTYPE_HMAC_SHA1_96_AES128 0x000f +#define CKSUMTYPE_HMAC_SHA1_96_AES256 0x0010 +#define CKSUMTYPE_HMAC_MD5_ARCFOUR -138/* Microsoft md5 hmac cksumtype */ /* from gssapi_err_krb5.h */ #define KG_CCACHE_NOMATCH (39756032L)@@ -212,6 +235,11 @@ make_checksum(struct krb5_ctx *kctx, char *header, int hdrlen, struct xdr_buf *body, int body_offset, u8 *cksumkey, struct xdr_netobj *cksumout); +u32 +make_checksum_v2 (struct krb5_ctx *,char *header,int hdrlen, +struct xdr_buf *body,int body_offset,u8 *key, +struct xdr_netobj *cksum); +u32 gss_get_mic_kerberos (struct gss_ctx *,struct xdr_buf *,struct xdr_netobj *);net/sunrpc/auth_gss/gss_krb5_seal.c +3
-0@@ -134,6 +161,46 @@ gss_get_mic_v1(struct krb5_ctx *ctx, struct xdr_buf *text, }u32 +gss_get_mic_v2 (struct krb5_ctx *ctx,struct xdr_buf *text, +struct xdr_netobj *token) +{
net/sunrpc/auth_gss/gss_krb5_seal.c gss_get_mic_v1(struct krb5_ctx *ctx, struct xdr_buf *text, · line 176
Quoted 10 lines
net/sunrpc/auth_gss/gss_krb5_seal.c +10
-0+char cksumdata[GSS_KRB5_MAX_CKSUM_LEN ]; +struct xdr_netobj cksumobj = { .len =sizeof (cksumdata), + .data = cksumdata}; +void *krb5_hdr; +s32 now; +u64 seq_send; +u8 *cksumkey; + +dprintk ("RPC: %s\n" , __func__); +BUG_ON (ctx ==NULL );
^^^^^^^^^^^^^^^^^^^^
We shouldn't need a BUG_ON for this. If ctx == NULL we will Oops anyway.
Quoted 45 lines
net/sunrpc/auth_gss/gss_krb5_seal.c +30
-0+ + krb5_hdr =setup_token_v2 (ctx, token); + +/* Set up the sequence number. Now 64-bits in clear +* text and w/o direction indicator */ +spin_lock (&krb5_seq_lock); + seq_send = ctx->seq_send64++; +spin_unlock (&krb5_seq_lock); + *((u64 *)(krb5_hdr +8 )) =cpu_to_be64 (seq_send); + +if (ctx->initiate) + cksumkey = ctx->initiator_sign; +else + cksumkey = ctx->acceptor_sign; + +if (make_checksum_v2 (ctx, krb5_hdr,GSS_KRB5_TOK_HDR_LEN , + text,0 , cksumkey, &cksumobj)) +return GSS_S_FAILURE ; + +memcpy (krb5_hdr +GSS_KRB5_TOK_HDR_LEN , cksumobj.data, cksumobj.len); + + now =get_seconds (); + +return (ctx->endtime < now) ?GSS_S_CONTEXT_EXPIRED :GSS_S_COMPLETE ; +} + +u32 gss_get_mic_kerberos (struct gss_ctx *gss_ctx,struct xdr_buf *text,struct xdr_netobj *token) {@@ -155,6 +213,9 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,case ENCTYPE_DES_CBC_RAW :case ENCTYPE_DES3_CBC_RAW :return gss_verify_mic_v1 (ctx, message_buffer, read_token); +case ENCTYPE_AES128_CTS_HMAC_SHA1_96 : +case ENCTYPE_AES256_CTS_HMAC_SHA1_96 : +return gss_verify_mic_v2 (ctx, message_buffer, read_token); } }net/sunrpc/auth_gss/gss_krb5_wrap.c +0
-0
net/sunrpc/auth_gss/gss_krb5_wrap.c gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf) · line 348
Quoted 7 lines
net/sunrpc/auth_gss/gss_krb5_wrap.c +4
-0@@ -342,6 +342,247 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)return GSS_S_COMPLETE ; } +#define TEST_ROTATE 0 +#define TEST_EXTRA_COUNT 0 + +#if TEST_ROTATE
^^^^^^^^^^^^^^^^^^^^^^^
Eh??????????????
PATCH 14/22 gss_krb5: add remaining pieces to enable AES encryption support
In reply to [email protected]From: Kevin Coffman <[email protected]>
Add the remaining pieces to enable support for Kerberos AES encryption types.
--- include/linux/sunrpc/gss_krb5.h | 20 +++ net/sunrpc/auth_gss/gss_krb5_crypto.c | 248 +++++++++++++++++++++++++++++++++ net/sunrpc/auth_gss/gss_krb5_keys.c | 30 ++++ net/sunrpc/auth_gss/gss_krb5_mech.c | 86 ++++++++++-- net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +- 5 files changed, 376 insertions(+), 10 deletions(-)
include/linux/sunrpc/gss_krb5.h +20 -0
@@ -99,6 +99,8 @@ struct krb5_ctx {struct crypto_blkcipher *seq;struct crypto_blkcipher *acceptor_enc;struct crypto_blkcipher *initiator_enc; +struct crypto_blkcipher *acceptor_enc_aux; +struct crypto_blkcipher *initiator_enc_aux;u8 cksum[GSS_KRB5_MAX_KEYLEN ];s32 endtime;u32 seq_send;
@@ -294,3 +296,21 @@ u32 gss_krb5_des3_make_key(struct gss_krb5_enctype *gk5e, struct xdr_netobj *randombits, struct xdr_netobj *key); + +u32 +gss_krb5_aes_make_key (struct gss_krb5_enctype *gk5e, +struct xdr_netobj *randombits, +struct xdr_netobj *key); + +u32 +gss_krb5_aes_encrypt (struct krb5_ctx *kctx,u32 offset, +struct xdr_buf *buf,int ec, +struct page **pages); + +u32 +gss_krb5_aes_decrypt (struct krb5_ctx *kctx,u32 offset, +struct xdr_buf *buf,u32 *plainoffset, +u32 *plainlen); + +void +make_confounder (char *p,u32 conflen);
net/sunrpc/auth_gss/gss_krb5_crypto.c +248 -0
257 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_keys.c +30 -0
@@ -303,3 +303,33 @@ u32 gss_krb5_des3_make_key(struct gss_krb5_enctype *gk5e, err_out:return (ret); } + +/* +* This is the aes key derivation postprocess function +*/ +u32 gss_krb5_aes_make_key (struct gss_krb5_enctype *gk5e, +struct xdr_netobj *randombits, +struct xdr_netobj *key) +{ +u32 ret =EINVAL ; + +if (key->len !=16 && key->len !=32 ) { +dprintk ("%s: key->len is %d\n" , __func__, key->len); + goto err_out; + } +if (randombits->len !=16 && randombits->len !=32 ) { +dprintk ("%s: randombits->len is %d\n" , + __func__, randombits->len); + goto err_out; + } +if (randombits->len != key->len) { +dprintk ("%s: randombits->len is %d, key->len is %d\n" , + __func__, randombits->len, key->len); + goto err_out; + } +memcpy (key->data, randombits->data, key->len); + ret =0 ; +err_out: +return (ret); +} +
net/sunrpc/auth_gss/gss_krb5_mech.c +77 -9
140 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_wrap.c +1 -1
@@ -114,7 +114,7 @@ out:return 0 ; } -static void +void make_confounder (char *p,u32 conflen) {static u64 i =0 ;
Signature · 1 line
1.6.6.1
PATCH 15/22 gss_krb5: Update pipefs file
In reply to [email protected]From: Kevin Coffman <[email protected]>
Update pipefs file indicating which Kerberos enctypes the kernel supports
--- net/sunrpc/rpc_pipe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/sunrpc/rpc_pipe.c +1 -1
@@ -404,7 +404,7 @@ static const struct file_operations rpc_info_operations = {static int rpc_show_krb5_info (struct seq_file *m,void *v) { -seq_printf (m,"enctypes: 16,3,1,2\n" ); +seq_printf (m,"enctypes: 18,17,16,3,1,2\n" );return 0 ; }
Signature · 1 line
1.6.6.1
PATCH 16/22 arcfour-hmac support
In reply to [email protected]From: Kevin Coffman <[email protected]>
For arcfour-hmac support, the make_checksum function needs a usage field to correctly calculate the checksum differently for MIC and WRAP tokens.
--- include/linux/sunrpc/gss_krb5.h | 4 ++-- net/sunrpc/auth_gss/gss_krb5_crypto.c | 15 +++++++++++---- net/sunrpc/auth_gss/gss_krb5_seal.c | 13 +++++++++---- net/sunrpc/auth_gss/gss_krb5_unseal.c | 12 ++++++++---- net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 ++-- 5 files changed, 32 insertions(+), 16 deletions(-)
include/linux/sunrpc/gss_krb5.h +2 -2
@@ -235,12 +235,12 @@ enum seal_alg {u32 make_checksum (struct krb5_ctx *kctx,char *header,int hdrlen,struct xdr_buf *body,int body_offset,u8 *cksumkey, -struct xdr_netobj *cksumout); +unsigned int usage,struct xdr_netobj *cksumout);u32 make_checksum_v2 (struct krb5_ctx *,char *header,int hdrlen,struct xdr_buf *body,int body_offset,u8 *key, -struct xdr_netobj *cksum); +unsigned int usage,struct xdr_netobj *cksum);u32 gss_get_mic_kerberos (struct gss_ctx *,struct xdr_buf *,struct xdr_netobj *);
net/sunrpc/auth_gss/gss_krb5_crypto.c +11 -4
@@ -133,7 +133,7 @@ checksummer(struct scatterlist *sg, void *data)u32 make_checksum (struct krb5_ctx *kctx,char *header,int hdrlen,struct xdr_buf *body,int body_offset,u8 *cksumkey, -struct xdr_netobj *cksumout) +unsigned int usage,struct xdr_netobj *cksumout) {struct hash_desc desc;struct scatterlist sg[1 ];
@@ -209,7 +209,7 @@ out:u32 make_checksum_v2 (struct krb5_ctx *kctx,char *header,int hdrlen,struct xdr_buf *body,int body_offset,u8 *cksumkey, -struct xdr_netobj *cksumout) +unsigned int usage,struct xdr_netobj *cksumout) {struct hash_desc desc;struct scatterlist sg[1 ];
@@ -556,15 +556,18 @@ gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,int nblocks, nbytes;struct encryptor_desc desc;u32 cbcbytes; +unsigned int usage;if (kctx->initiate) { cipher = kctx->initiator_enc; aux_cipher = kctx->initiator_enc_aux; cksumkey = kctx->initiator_integ; + usage =KG_USAGE_INITIATOR_SEAL ; }else { cipher = kctx->acceptor_enc; aux_cipher = kctx->acceptor_enc_aux; cksumkey = kctx->acceptor_integ; + usage =KG_USAGE_ACCEPTOR_SEAL ; } blocksize =crypto_blkcipher_blocksize (cipher);
@@ -609,7 +612,8 @@ gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset, buf->pages = pages; err =make_checksum_v2 (kctx,NULL ,0 , buf, - offset +GSS_KRB5_TOK_HDR_LEN , cksumkey, &hmac); + offset +GSS_KRB5_TOK_HDR_LEN , + cksumkey, usage, &hmac); buf->pages = save_pages;if (err)return GSS_S_FAILURE ;
@@ -673,15 +677,18 @@ gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, struct xdr_buf *buf,u8 pkt_hmac[GSS_KRB5_MAX_CKSUM_LEN ];int nblocks, blocksize, cbcbytes;struct decryptor_desc desc; +unsigned int usage;if (kctx->initiate) { cipher = kctx->acceptor_enc; aux_cipher = kctx->acceptor_enc_aux; cksum_key = kctx->acceptor_integ; + usage =KG_USAGE_ACCEPTOR_SEAL ; }else { cipher = kctx->initiator_enc; aux_cipher = kctx->initiator_enc_aux; cksum_key = kctx->initiator_integ; + usage =KG_USAGE_INITIATOR_SEAL ; } blocksize =crypto_blkcipher_blocksize (cipher);
@@ -724,7 +731,7 @@ gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, struct xdr_buf *buf, our_hmac_obj.data = our_hmac; ret =make_checksum_v2 (kctx,NULL ,0 , &subbuf,0 , - cksum_key, &our_hmac_obj); + cksum_key, usage, &our_hmac_obj);if (ret) goto out_err;
net/sunrpc/auth_gss/gss_krb5_seal.c +9 -4
@@ -143,7 +143,8 @@ gss_get_mic_v1(struct krb5_ctx *ctx, struct xdr_buf *text,else cksumkey =NULL ; -if (make_checksum (ctx, ptr,8 , text,0 , cksumkey, &md5cksum)) +if (make_checksum (ctx, ptr,8 , text,0 , cksumkey, +KG_USAGE_SIGN , &md5cksum))return GSS_S_FAILURE ;memcpy (ptr +GSS_KRB5_TOK_HDR_LEN , md5cksum.data, md5cksum.len);
@@ -171,6 +172,7 @@ gss_get_mic_v2(struct krb5_ctx *ctx, struct xdr_buf *text,s32 now;u64 seq_send;u8 *cksumkey; +unsigned int cksum_usage;dprintk ("RPC: %s\n" , __func__);BUG_ON (ctx ==NULL );
@@ -184,13 +186,16 @@ gss_get_mic_v2(struct krb5_ctx *ctx, struct xdr_buf *text,spin_unlock (&krb5_seq_lock); *((u64 *)(krb5_hdr +8 )) =cpu_to_be64 (seq_send); -if (ctx->initiate) +if (ctx->initiate) { cksumkey = ctx->initiator_sign; -else + cksum_usage =KG_USAGE_INITIATOR_SIGN ; + }else { cksumkey = ctx->acceptor_sign; + cksum_usage =KG_USAGE_ACCEPTOR_SIGN ; + }if (make_checksum_v2 (ctx, krb5_hdr,GSS_KRB5_TOK_HDR_LEN , - text,0 , cksumkey, &cksumobj)) + text,0 , cksumkey, cksum_usage, &cksumobj))return GSS_S_FAILURE ;memcpy (krb5_hdr +GSS_KRB5_TOK_HDR_LEN , cksumobj.data, cksumobj.len);
net/sunrpc/auth_gss/gss_krb5_unseal.c +8 -4
@@ -116,7 +116,7 @@ gss_verify_mic_v1(struct krb5_ctx *ctx, cksumkey =NULL ;if (make_checksum (ctx, ptr,8 , message_buffer,0 , - cksumkey, &md5cksum)) + cksumkey,KG_USAGE_SIGN , &md5cksum))return GSS_S_FAILURE ; if (memcmp(md5cksum.data, ptr + GSS_KRB5_TOK_HDR_LEN,
@@ -155,6 +155,7 @@ gss_verify_mic_v2(struct krb5_ctx *ctx,u8 *cksumkey;u8 flags;int i; +unsigned int cksum_usage;dprintk ("RPC: %s\n" , __func__);
@@ -175,13 +176,16 @@ gss_verify_mic_v2(struct krb5_ctx *ctx,if (ptr[i] !=0xff )return GSS_S_DEFECTIVE_TOKEN ; -if (ctx->initiate) +if (ctx->initiate) { cksumkey = ctx->acceptor_sign; -else + cksum_usage =KG_USAGE_ACCEPTOR_SIGN ; + }else { cksumkey = ctx->initiator_sign; + cksum_usage =KG_USAGE_INITIATOR_SIGN ; + }if (make_checksum_v2 (ctx, ptr,GSS_KRB5_TOK_HDR_LEN , message_buffer,0 , - cksumkey, &cksumobj)) + cksumkey, cksum_usage, &cksumobj))return GSS_S_FAILURE ; if (memcmp(cksumobj.data, ptr + GSS_KRB5_TOK_HDR_LEN,
net/sunrpc/auth_gss/gss_krb5_wrap.c +2 -2
@@ -217,7 +217,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset, tmp_pages = buf->pages; buf->pages = pages;if (make_checksum (kctx, ptr,8 , buf, offset + headlen - blocksize, - cksumkey, &md5cksum)) + cksumkey,KG_USAGE_SEAL , &md5cksum))return GSS_S_FAILURE ; buf->pages = tmp_pages;
@@ -300,7 +300,7 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf) cksumkey =NULL ;if (make_checksum (kctx, ptr,8 , buf, crypt_offset, - cksumkey, &md5cksum)) + cksumkey,KG_USAGE_SEAL , &md5cksum))return GSS_S_FAILURE ; if (memcmp(md5cksum.data, ptr + GSS_KRB5_TOK_HDR_LEN,
Signature · 1 line
1.6.6.1
PATCH 17/22 Save the raw session key in the context
In reply to [email protected]From: Kevin Coffman <[email protected]>
This is needed for deriving arcfour-hmac keys "on the fly" using the sequence number or checksu
--- include/linux/sunrpc/gss_krb5.h | 1 + net/sunrpc/auth_gss/gss_krb5_mech.c | 27 +++++++++++++-------------- 2 files changed, 14 insertions(+), 14 deletions(-)
include/linux/sunrpc/gss_krb5.h +1 -0
@@ -101,6 +101,7 @@ struct krb5_ctx {struct crypto_blkcipher *initiator_enc;struct crypto_blkcipher *acceptor_enc_aux;struct crypto_blkcipher *initiator_enc_aux; +u8 Ksess[GSS_KRB5_MAX_KEYLEN ];/* session key */ u8 cksum[GSS_KRB5_MAX_KEYLEN ];s32 endtime;u32 seq_send;
net/sunrpc/auth_gss/gss_krb5_mech.c +13 -14
@@ -350,7 +350,7 @@ set_cdata(u8 cdata[GSS_KRB5_K5CLENGTH], u32 usage, u8 seed) }static int -context_derive_keys_des3 (struct krb5_ctx *ctx,u8 *rawkey,u32 keylen) +context_derive_keys_des3 (struct krb5_ctx *ctx) {struct xdr_netobj c, keyin, keyout;u8 cdata[GSS_KRB5_K5CLENGTH ];
@@ -359,18 +359,18 @@ context_derive_keys_des3(struct krb5_ctx *ctx, u8 *rawkey, u32 keylen) c.len =GSS_KRB5_K5CLENGTH ; c.data = cdata; - keyin.data = rawkey; - keyin.len = keylen; - keyout.len = keylen; + keyin.data = ctx->Ksess; + keyin.len = ctx->gk5e->keylength; + keyout.len = ctx->gk5e->keylength;/* seq uses the raw key */ ctx->seq =context_v2_alloc_cipher (ctx, ctx->gk5e->encrypt_name, - rawkey); + ctx->Ksess);if (ctx->seq ==NULL ) goto out_err; ctx->enc =context_v2_alloc_cipher (ctx, ctx->gk5e->encrypt_name, - rawkey); + ctx->Ksess);if (ctx->enc ==NULL ) goto out_free_seq;
@@ -395,7 +395,7 @@ out_err: }static int -context_derive_keys_new (struct krb5_ctx *ctx,u8 *rawkey,u32 keylen) +context_derive_keys_new (struct krb5_ctx *ctx) {struct xdr_netobj c, keyin, keyout;u8 cdata[GSS_KRB5_K5CLENGTH ];
@@ -404,9 +404,9 @@ context_derive_keys_new(struct krb5_ctx *ctx, u8 *rawkey, u32 keylen) c.len =GSS_KRB5_K5CLENGTH ; c.data = cdata; - keyin.data = rawkey; - keyin.len = keylen; - keyout.len = keylen; + keyin.data = ctx->Ksess; + keyin.len = ctx->gk5e->keylength; + keyout.len = ctx->gk5e->keylength;/* initiator seal encryption */ set_cdata (cdata,KG_USAGE_INITIATOR_SEAL ,KEY_USAGE_SEED_ENCRYPTION );
@@ -508,7 +508,6 @@ out_err:static int gss_import_v2_context (const void *p,const void *end,struct krb5_ctx *ctx) { -u8 rawkey[GSS_KRB5_MAX_KEYLEN ];int keylen; p =simple_get_bytes (p, end, &ctx->flags,sizeof (ctx->flags));
@@ -544,7 +543,7 @@ gss_import_v2_context(const void *p, const void *end, struct krb5_ctx *ctx) } keylen = ctx->gk5e->keylength; - p =simple_get_bytes (p, end, rawkey, keylen); + p =simple_get_bytes (p, end, ctx->Ksess, keylen);if (IS_ERR (p)) goto out_err;
@@ -563,10 +562,10 @@ gss_import_v2_context(const void *p, const void *end, struct krb5_ctx *ctx)switch (ctx->enctype) {case ENCTYPE_DES3_CBC_RAW : -return context_derive_keys_des3 (ctx, rawkey, keylen); +return context_derive_keys_des3 (ctx);case ENCTYPE_AES128_CTS_HMAC_SHA1_96 :case ENCTYPE_AES256_CTS_HMAC_SHA1_96 : -return context_derive_keys_new (ctx, rawkey, keylen); +return context_derive_keys_new (ctx);default :return -EINVAL ; }
Signature · 1 line
1.6.6.1
PATCH 18/22 More arcfour-hmac support
In reply to [email protected]From: Kevin Coffman <[email protected]>
For the arcfour-hmac support, the make_seq_num and get_seq_num functions need access to the kerberos context structure. This will be used in a later patch.
--- include/linux/sunrpc/gss_krb5.h | 6 ++++-- net/sunrpc/auth_gss/gss_krb5_seal.c | 5 ++--- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 6 ++++-- net/sunrpc/auth_gss/gss_krb5_unseal.c | 3 ++- net/sunrpc/auth_gss/gss_krb5_wrap.c | 6 +++--- 5 files changed, 15 insertions(+), 11 deletions(-)
include/linux/sunrpc/gss_krb5.h +4 -2
@@ -275,12 +275,14 @@ gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *inbuf, int offset);s32 -krb5_make_seq_num (struct crypto_blkcipher *key, +krb5_make_seq_num (struct krb5_ctx *kctx, +struct crypto_blkcipher *key,int direction,u32 seqnum,unsigned char *cksum,unsigned char *buf);s32 -krb5_get_seq_num (struct crypto_blkcipher *key, +krb5_get_seq_num (struct krb5_ctx *kctx, +struct crypto_blkcipher *key,unsigned char *cksum,unsigned char *buf,int *direction,u32 *seqnum);
net/sunrpc/auth_gss/gss_krb5_seal.c +2 -3
@@ -153,9 +153,8 @@ gss_get_mic_v1(struct krb5_ctx *ctx, struct xdr_buf *text, seq_send = ctx->seq_send++;spin_unlock (&krb5_seq_lock); -if (krb5_make_seq_num (ctx->seq, ctx->initiate ?0 :0xff , - seq_send, ptr +GSS_KRB5_TOK_HDR_LEN , - ptr +8 )) +if (krb5_make_seq_num (ctx, ctx->seq, ctx->initiate ?0 :0xff , + seq_send, ptr +GSS_KRB5_TOK_HDR_LEN , ptr +8 ))return GSS_S_FAILURE ;return (ctx->endtime < now) ?GSS_S_CONTEXT_EXPIRED :GSS_S_COMPLETE ;
net/sunrpc/auth_gss/gss_krb5_seqnum.c +4 -2
@@ -41,7 +41,8 @@#endif s32 -krb5_make_seq_num (struct crypto_blkcipher *key, +krb5_make_seq_num (struct krb5_ctx *kctx, +struct crypto_blkcipher *key,int direction,u32 seqnum,unsigned char *cksum,unsigned char *buf)
@@ -62,7 +63,8 @@ krb5_make_seq_num(struct crypto_blkcipher *key, }s32 -krb5_get_seq_num (struct crypto_blkcipher *key, +krb5_get_seq_num (struct krb5_ctx *kctx, +struct crypto_blkcipher *key,unsigned char *cksum,unsigned char *buf,int *direction,u32 *seqnum)
net/sunrpc/auth_gss/gss_krb5_unseal.c +2 -1
@@ -132,7 +132,8 @@ gss_verify_mic_v1(struct krb5_ctx *ctx,/* do sequencing checks */ -if (krb5_get_seq_num (ctx->seq, ptr +GSS_KRB5_TOK_HDR_LEN , ptr +8 , &direction, &seqnum)) +if (krb5_get_seq_num (ctx, ctx->seq, ptr +GSS_KRB5_TOK_HDR_LEN , ptr +8 , + &direction, &seqnum))return GSS_S_FAILURE ; if ((ctx->initiate && direction != 0xff) ||
net/sunrpc/auth_gss/gss_krb5_wrap.c +3 -3
@@ -229,7 +229,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,/* XXX would probably be more efficient to compute checksum * and encrypt at the same time: */ -if ((krb5_make_seq_num (kctx->seq, kctx->initiate ?0 :0xff , +if ((krb5_make_seq_num (kctx, kctx->seq, kctx->initiate ?0 :0xff , seq_send, ptr +GSS_KRB5_TOK_HDR_LEN , ptr +8 )))return GSS_S_FAILURE ;
@@ -316,8 +316,8 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)/* do sequencing checks */ -if (krb5_get_seq_num (kctx->seq, ptr +GSS_KRB5_TOK_HDR_LEN , ptr +8 , - &direction, &seqnum)) +if (krb5_get_seq_num (kctx, kctx->seq, ptr +GSS_KRB5_TOK_HDR_LEN , + ptr +8 , &direction, &seqnum))return GSS_S_BAD_SIG ; if ((kctx->initiate && direction != 0xff) ||
Signature · 1 line
1.6.6.1
Re: [PATCH 18/22] More arcfour-hmac support
Quoted 27 lines · On Mon, 2010-03-15 at 08:20 -0400, [email protected] wrote:
From: Kevin Coffman <[email protected]>
For the arcfour-hmac support, the
make_seq_numandget_seq_numfunctions need access to the kerberos context structure. This will be used in a later patch.Signed-off-by Kevin Coffman <[email protected]>Signed-off-by Steve Dickson <[email protected]>--- include/linux/sunrpc/gss_krb5.h | 6 ++++-- net/sunrpc/auth_gss/gss_krb5_seal.c | 5 ++--- net/sunrpc/auth_gss/gss_krb5_seqnum.c | 6 ++++-- net/sunrpc/auth_gss/gss_krb5_unseal.c | 3 ++- net/sunrpc/auth_gss/gss_krb5_wrap.c | 6 +++--- 5 files changed, 15 insertions(+), 11 deletions(-)include/linux/sunrpc/gss_krb5.h +2
-1@@ -275,12 +275,14 @@ gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *inbuf, int offset); s32 -krb5_make_seq_num(struct crypto_blkcipher *key, +krb5_make_seq_num(struct krb5_ctx *kctx, + struct crypto_blkcipher *key,
include/linux/sunrpc/gss_krb5.h gss_decrypt_xdr_buf(struct crypto_blkcipher *tfm, struct xdr_buf *inbuf, · line 288
Quoted 10 lines
include/linux/sunrpc/gss_krb5.h +2
-1int direction, u32 seqnum, unsigned char *cksum, unsigned char *buf);s32 -krb5_get_seq_num (struct crypto_blkcipher *key, +krb5_get_seq_num (struct krb5_ctx *kctx, +struct crypto_blkcipher *key,unsigned char *cksum,unsigned char *buf,int *direction,u32 *seqnum);
It looks as if we are always passing in both ctx and ctx->seq. Is there any reason why we should keep both parameters?
PATCH 19/22 Use confounder length in wrap code
In reply to [email protected]From: Kevin Coffman <[email protected]>
All encryption types use a confounder at the beginning of the wrap token. In all encryption types except arcfour-hmac, the confounder is the same as the blocksize. arcfour-hmac has a blocksize of one, but uses an eight byte confounder.
Add an entry to the crypto framework definitions for the confounder length and change the wrap/unwrap code to use the confounder length rather than assuming it is always the blocksize.
--- include/linux/sunrpc/gss_krb5.h | 3 +++ net/sunrpc/auth_gss/gss_krb5_crypto.c | 6 +++--- net/sunrpc/auth_gss/gss_krb5_mech.c | 4 ++++ net/sunrpc/auth_gss/gss_krb5_wrap.c | 12 +++++++----- 4 files changed, 17 insertions(+), 8 deletions(-)
include/linux/sunrpc/gss_krb5.h +3 -0
@@ -64,6 +64,9 @@ struct gss_krb5_enctype {const u16 signalg;/* signing algorithm */ const u16 sealalg;/* sealing algorithm */ const u32 blocksize;/* encryption blocksize */ +const u32 conflen;/* confounder length +(normally the same as +the blocksize) */ const u32 cksumlength;/* checksum length */ const u32 keyed_cksum;/* is it a keyed cksum? */ const u32 keybytes;/* raw key len, in bytes */
net/sunrpc/auth_gss/gss_krb5_crypto.c +3 -3
@@ -573,9 +573,9 @@ gss_krb5_aes_encrypt(struct krb5_ctx *kctx, u32 offset,/* hide the gss token header and insert the confounder */ offset +=GSS_KRB5_TOK_HDR_LEN ; -if (shift_head_data (buf, offset, blocksize)) +if (shift_head_data (buf, offset, kctx->gk5e->conflen))return GSS_S_FAILURE ; -make_confounder (buf->head[0 ].iov_base + offset, blocksize); +make_confounder (buf->head[0 ].iov_base + offset, kctx->gk5e->conflen); offset -=GSS_KRB5_TOK_HDR_LEN ;if (buf->tail[0 ].iov_base !=NULL ) {
@@ -745,7 +745,7 @@ gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, struct xdr_buf *buf, ret =GSS_S_BAD_SIG ; goto out_err; } - *headskip =crypto_blkcipher_blocksize (cipher); + *headskip = kctx->gk5e->conflen; *tailskip = kctx->gk5e->cksumlength; out_err:if (ret && ret !=GSS_S_BAD_SIG )
net/sunrpc/auth_gss/gss_krb5_mech.c +4 -0
@@ -68,6 +68,7 @@ static struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { .keybytes = 7, .keylength = 8, .blocksize = 8, + .conflen = 8, .cksumlength = 8, .keyed_cksum = 0, },
@@ -88,6 +89,7 @@ static struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { .keybytes = 21, .keylength = 24, .blocksize = 8, + .conflen = 8, .cksumlength = 20, .keyed_cksum = 1, },
@@ -110,6 +112,7 @@ static struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { .keybytes = 16, .keylength = 16, .blocksize = 16, + .conflen = 16, .cksumlength = 12, .keyed_cksum = 1, },
@@ -132,6 +135,7 @@ static struct gss_krb5_enctype supported_gss_krb5_enctypes[] = { .keybytes = 32, .keylength = 32, .blocksize = 16, + .conflen = 16, .cksumlength = 12, .keyed_cksum = 1, },
net/sunrpc/auth_gss/gss_krb5_wrap.c +7 -5
@@ -169,6 +169,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,struct page **tmp_pages;u32 seq_send;u8 *cksumkey; +u32 conflen = kctx->gk5e->conflen;dprintk ("RPC: %s\n" , __func__);
@@ -178,7 +179,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset, blocksize =crypto_blkcipher_blocksize (kctx->enc);gss_krb5_add_padding (buf, offset, blocksize);BUG_ON ((buf->len - offset) % blocksize); - plainlen = blocksize + buf->len - offset; + plainlen = conflen + buf->len - offset; headlen =g_token_size (&kctx->mech_used, GSS_KRB5_TOK_HDR_LEN + kctx->gk5e->cksumlength + plainlen) -
@@ -206,7 +207,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,memset (ptr +4 ,0xff ,4 ); *(__be16 *)(ptr +4 ) =cpu_to_le16 (kctx->gk5e->sealalg); -make_confounder (msg_start, blocksize); +make_confounder (msg_start, conflen);if (kctx->gk5e->keyed_cksum) cksumkey = kctx->cksum;
@@ -216,7 +217,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset,/* XXXJBF: UGH!: */ tmp_pages = buf->pages; buf->pages = pages; -if (make_checksum (kctx, ptr,8 , buf, offset + headlen - blocksize, +if (make_checksum (kctx, ptr,8 , buf, offset + headlen - conflen, cksumkey,KG_USAGE_SEAL , &md5cksum))return GSS_S_FAILURE ; buf->pages = tmp_pages;
@@ -233,7 +234,7 @@ gss_wrap_kerberos_v1(struct krb5_ctx *kctx, int offset, seq_send, ptr + GSS_KRB5_TOK_HDR_LEN, ptr + 8)))return GSS_S_FAILURE ; -if (gss_encrypt_xdr_buf (kctx->enc, buf, offset + headlen - blocksize, +if (gss_encrypt_xdr_buf (kctx->enc, buf, offset + headlen - conflen, pages))return GSS_S_FAILURE ;
@@ -256,6 +257,7 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf)void *data_start, *orig_start;int data_len;int blocksize; +u32 conflen = kctx->gk5e->conflen;int crypt_offset;u8 *cksumkey;
@@ -329,7 +331,7 @@ gss_unwrap_kerberos_v1(struct krb5_ctx *kctx, int offset, struct xdr_buf *buf) blocksize =crypto_blkcipher_blocksize (kctx->enc); data_start = ptr + (GSS_KRB5_TOK_HDR_LEN + kctx->gk5e->cksumlength) + - blocksize; + conflen; orig_start = buf->head[0 ].iov_base + offset; data_len = (buf->head[0 ].iov_base + buf->head[0 ].iov_len) - data_start;memmove (orig_start, data_start, data_len);
Signature · 1 line
1.6.6.1
PATCH 20/22 Add support for rc4-hmac encryption
In reply to [email protected]From: Kevin Coffman <[email protected]>
Add necessary changes to add kernel support for the rc4-hmac Kerberos encryption type used by Microsoft and described in rfc4757.
--- include/linux/sunrpc/gss_krb5.h | 9 ++ net/sunrpc/auth_gss/gss_krb5_crypto.c | 255 +++++++++++++++++++++++++++++++++ net/sunrpc/auth_gss/gss_krb5_mech.c | 96 ++++++++++++ net/sunrpc/auth_gss/gss_krb5_seal.c | 1 + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 77 ++++++++++ net/sunrpc/auth_gss/gss_krb5_unseal.c | 1 + net/sunrpc/auth_gss/gss_krb5_wrap.c | 66 +++++++-- 7 files changed, 492 insertions(+), 13 deletions(-)
include/linux/sunrpc/gss_krb5.h +9 -0
@@ -318,5 +318,14 @@ gss_krb5_aes_decrypt(struct krb5_ctx *kctx, u32 offset, struct xdr_buf *buf, u32 *plainoffset, u32 *plainlen); +int +krb5_rc4_setup_seq_key (struct krb5_ctx *kctx, +struct crypto_blkcipher *cipher, +unsigned char *cksum); + +int +krb5_rc4_setup_enc_key (struct krb5_ctx *kctx, +struct crypto_blkcipher *cipher, +s32 seqnum);void make_confounder (char *p,u32 conflen);
net/sunrpc/auth_gss/gss_krb5_crypto.c +255 -0
270 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_mech.c +96 -0
114 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_seal.c +1 -0
@@ -215,6 +215,7 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,BUG ();case ENCTYPE_DES_CBC_RAW :case ENCTYPE_DES3_CBC_RAW : +case ENCTYPE_ARCFOUR_HMAC :return gss_get_mic_v1 (ctx, text, token);case ENCTYPE_AES128_CTS_HMAC_SHA1_96 :case ENCTYPE_AES256_CTS_HMAC_SHA1_96 :
net/sunrpc/auth_gss/gss_krb5_seqnum.c +77 -0
101 lines not on this page · raw message
net/sunrpc/auth_gss/gss_krb5_unseal.c +1 -0
@@ -217,6 +217,7 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,BUG ();case ENCTYPE_DES_CBC_RAW :case ENCTYPE_DES3_CBC_RAW : +case ENCTYPE_ARCFOUR_HMAC :return gss_verify_mic_v1 (ctx, message_buffer, read_token);case ENCTYPE_AES128_CTS_HMAC_SHA1_96 :case ENCTYPE_AES256_CTS_HMAC_SHA1_96 :
net/sunrpc/auth_gss/gss_krb5_wrap.c +53 -13
96 lines not on this page · raw message
Signature · 1 line
1.6.6.1
PATCH 21/22 Update the pipefs file
In reply to [email protected]From: Kevin Coffman <[email protected]>
Update the pipefs file indicating which Kerberos enctypes the kernel supports
--- net/sunrpc/rpc_pipe.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/sunrpc/rpc_pipe.c +1 -1
@@ -404,7 +404,7 @@ static const struct file_operations rpc_info_operations = {static int rpc_show_krb5_info (struct seq_file *m,void *v) { -seq_printf (m,"enctypes: 18,17,16,3,1,2\n" ); +seq_printf (m,"enctypes: 18,17,16,23,3,1,2\n" );return 0 ; }
Signature · 1 line
1.6.6.1
PATCH 22/22 Fixed memory leak in gss_import_v1_context()
In reply to [email protected]From: Peter Staubach <[email protected]>
--- net/sunrpc/auth_gss/gss_krb5_mech.c | 29 +++++++++++------------------ net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +- 2 files changed, 12 insertions(+), 19 deletions(-)
net/sunrpc/auth_gss/gss_krb5_mech.c +11 -18
@@ -271,18 +271,11 @@ out_err:static int gss_import_v1_context (const void *p,const void *end,struct krb5_ctx *ctx) { -const void *end = (const void *)((const char *)p + len); -struct krb5_ctx *ctx;int tmp; -if (!(ctx =kzalloc (sizeof (*ctx),GFP_NOFS ))) { - p =ERR_PTR (-ENOMEM ); - goto out_err; - } - p =simple_get_bytes (p, end, &ctx->initiate,sizeof (ctx->initiate));if (IS_ERR (p)) - goto out_err_free_ctx; + goto out_err;/* Old format supports only DES! Any other enctype uses new format */ ctx->enctype =ENCTYPE_DES_CBC_RAW ;
@@ -296,35 +289,35 @@ gss_import_v1_context(const void *p, const void *end, struct krb5_ctx *ctx)* just give some minimal sanity-checking, and some we ignore * completely (like the next twenty bytes): */ if (unlikely (p +20 > end || p +20 < p)) - goto out_err_free_ctx; + goto out_err; p +=20 ; p =simple_get_bytes (p, end, &tmp,sizeof (tmp));if (IS_ERR (p)) - goto out_err_free_ctx; + goto out_err;if (tmp !=SGN_ALG_DES_MAC_MD5 ) { p =ERR_PTR (-ENOSYS ); - goto out_err_free_ctx; + goto out_err; } p =simple_get_bytes (p, end, &tmp,sizeof (tmp));if (IS_ERR (p)) - goto out_err_free_ctx; + goto out_err;if (tmp !=SEAL_ALG_DES ) { p =ERR_PTR (-ENOSYS ); - goto out_err_free_ctx; + goto out_err; } p =simple_get_bytes (p, end, &ctx->endtime,sizeof (ctx->endtime));if (IS_ERR (p)) - goto out_err_free_ctx; + goto out_err; p =simple_get_bytes (p, end, &ctx->seq_send,sizeof (ctx->seq_send));if (IS_ERR (p)) - goto out_err_free_ctx; + goto out_err; p =simple_get_netobj (p, end, &ctx->mech_used);if (IS_ERR (p)) - goto out_err_free_ctx; - p =get_key (p, end, &ctx->enc); + goto out_err; + p =get_key (p, end, ctx, &ctx->enc);if (IS_ERR (p)) goto out_err_free_mech; - p =get_key (p, end, &ctx->seq); + p =get_key (p, end, ctx, &ctx->seq);if (IS_ERR (p)) goto out_err_free_key1;if (p != end) {
net/sunrpc/auth_gss/gss_krb5_unseal.c +1 -1
@@ -200,7 +200,7 @@ gss_verify_mic_v2(struct krb5_ctx *ctx,/* do sequencing checks */ - seqnum =be64_to_cpu ((__be64 *)ptr +8 ); + seqnum =be64_to_cpup ((__be64 *)(ptr +8 ));return GSS_S_COMPLETE ; }
Signature · 1 line
1.6.6.1