Skip to content

RFC crypto: Add generic Kerberos library with AEAD template for hash-then-crypt

David Howells linux-crypto linux-fsdevel linux-nfs lkml netdev 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 RFC Latest24 patches 9 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/24crypto/krb5: Add API DocumentationDocumentation/crypto/index.rst Documentation/crypto/krb5.rst+263 -00 replies
2/24crypto/krb5: Add some constants out of sunrpc headersinclude/crypto/krb5.h+51 -00 replies
3/24crypto: Add 'krb5enc' hash and cipher AEAD algorithmcrypto/Kconfig crypto/Makefile crypto/krb5enc.c +1 more+511 -08 replies
4/24crypto/krb5: Test manager datacrypto/testmgr.c crypto/testmgr.h+417 -00 replies
5/24crypto/krb5: Implement Kerberos crypto corecrypto/Kconfig crypto/Makefile crypto/krb5/Kconfig +4 more+234 -00 replies
6/24crypto/krb5: Add an API to query the layout of the crypto sectioncrypto/krb5/krb5_api.c include/crypto/krb5.h+117 -00 replies
7/24crypto/krb5: Add an API to alloc and prepare a crypto objectcrypto/krb5/internal.h crypto/krb5/krb5_api.c include/crypto/krb5.h+161 -00 replies
8/24crypto/krb5: Add an API to perform requestscrypto/krb5/krb5_api.c include/crypto/krb5.h+162 -00 replies
9/24crypto/krb5: Provide infrastructure and key derivationcrypto/krb5/Makefile crypto/krb5/internal.h crypto/krb5/krb5_kdf.c +1 more+166 -00 replies
10/24crypto/krb5: Implement the Kerberos5 rfc3961 key derivationcrypto/krb5/Makefile crypto/krb5/internal.h crypto/krb5/rfc3961_simplified.c+415 -10 replies
11/24crypto/krb5: Provide RFC3961 setkey packaging functionscrypto/krb5/internal.h crypto/krb5/rfc3961_simplified.c+132 -40 replies
12/24crypto/krb5: Implement the Kerberos5 rfc3961 encrypt and decrypt functionscrypto/krb5/internal.h crypto/krb5/rfc3961_simplified.c+159 -00 replies
13/24crypto/krb5: Implement the Kerberos5 rfc3961 get_mic and verify_miccrypto/krb5/internal.h crypto/krb5/rfc3961_simplified.c+140 -00 replies
14/24crypto/krb5: Implement the AES enctypes from rfc3962crypto/krb5/Kconfig crypto/krb5/Makefile crypto/krb5/internal.h +2 more+126 -10 replies
15/24crypto/krb5: Implement the AES enctypes from rfc8009crypto/krb5/Kconfig crypto/krb5/Makefile crypto/krb5/internal.h +3 more+322 -10 replies
16/24crypto/krb5: Implement the AES encrypt/decrypt from rfc8009crypto/krb5/rfc8009_aes2.c+137 -20 replies
17/24crypto/krb5: Implement crypto self-testingcrypto/krb5/Kconfig crypto/krb5/Makefile crypto/krb5/internal.h +3 more+652 -00 replies
18/24crypto/krb5: Add the AES self-testing data from rfc8009crypto/krb5/selftest_data.c+118 -00 replies
19/24crypto/krb5: Implement the Camellia enctypes from rfc6803crypto/krb5/Kconfig crypto/krb5/Makefile crypto/krb5/internal.h +4 more+387 -00 replies
20/24rxrpc: Add the security index for yfs-rxgkfs/afs/misc.c include/uapi/linux/rxrpc.h+30 -00 replies
21/24rxrpc: Add YFS RxGK (GSSAPI) security classinclude/keys/rxrpc-type.h net/rxrpc/key.c+200 -00 replies
22/24rxrpc: rxgk: Provide infrastructure and key derivationnet/rxrpc/Kconfig net/rxrpc/Makefile net/rxrpc/ar-internal.h +2 more+350 -10 replies
23/24rxrpc: rxgk: Implement the yfs-rxgk security class (GSSAPI)include/trace/events/rxrpc.h net/rxrpc/Makefile net/rxrpc/ar-internal.h +8 more+1485 -40 replies
24/24rxrpc: rxgk: Implement connection rekeyingnet/rxrpc/ar-internal.h net/rxrpc/conn_object.c net/rxrpc/rxgk.c+155 -70 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [RFC PATCH 00/24] crypto: Add generic Kerberos library with AEAD template for hash-then-crypt

Hi Herbert, Chuck,

Here's yet another go at a generic Kerberos crypto library in the kernel so that I can share code between rxrpc and sunrpc (and cifs?). I derived some of the parts from the sunrpc gss library and added more advanced AES and Camellia crypto.

I added an addition AEAD template type, derived from authenc, that does hash-then-crypt rather than crypt-then-hash as authenc does. I called it "krb5enc" for want of a better name. Possibly I should call it "hashenc" or something like that.

I went back to my previous more library-based approach, but for encrypt mode, I replaced the separate skcipher and shash objects with a single templated AEAD object - either krb5enc (AES+SHA1 and Camellia) or authenc (AES+SHA2).

Apart from that, things are much as they were previously from the point of view of someone using the API. There's a new pair of functions that, given an encoding type, a key and a usage value, will derive the necessary keys and return an AEAD or hash handle. These handles can then be passed to operation functions that will do the actual work of performing an encryption, a decryption, MIC generation or MIC verification.

Querying functions are also available to look up an encoding type table by kerberos protocol number and to help manage message layout.

This library has its own self-testing framework that checks more things than is possible with the testmgr, including subkey derivation. It also checks things about the output of encrypt + decrypt that testmgr doesn't. That said, testmgr is also provisioned with some encryption and checksumming tests for Camilla and AES2, though these have to be provisioned with the intermediate subkeys rather than the transport key.

Note that, for purposes of illustration, I've included some rxrpc patches that use this interface to implement the rxgk Rx security class. The branch also is based on net-next that carries some rxrpc patches that are a prerequisite for this, but the crypto patches don't need it.

---
The patches can be found here also:

http://git.kernel.org/cgit/linux/kernel/git/dhowells/linux-fs.git/log/?h=crypto-krb5

David

David Howells (24):
crypto/krb5: Add API Documentation
crypto/krb5: Add some constants out of sunrpc headers
crypto: Add 'krb5enc' hash and cipher AEAD algorithm crypto/krb5: Test manager data
crypto/krb5: Implement Kerberos crypto core
crypto/krb5: Add an API to query the layout of the crypto section crypto/krb5: Add an API to alloc and prepare a crypto object crypto/krb5: Add an API to perform requests
crypto/krb5: Provide infrastructure and key derivation crypto/krb5: Implement the Kerberos5 rfc3961 key derivation crypto/krb5: Provide RFC3961 setkey packaging functions crypto/krb5: Implement the Kerberos5 rfc3961 encrypt and decrypt
functions
crypto/krb5: Implement the Kerberos5 rfc3961 get_mic and verify_mic crypto/krb5: Implement the AES enctypes from rfc3962 crypto/krb5: Implement the AES enctypes from rfc8009 crypto/krb5: Implement the AES encrypt/decrypt from rfc8009 crypto/krb5: Implement crypto self-testing
crypto/krb5: Add the AES self-testing data from rfc8009 crypto/krb5: Implement the Camellia enctypes from rfc6803
rxrpc: Add the security index for yfs-rxgk
rxrpc: Add YFS RxGK (GSSAPI) security class
rxrpc: rxgk: Provide infrastructure and key derivation
rxrpc: rxgk: Implement the yfs-rxgk security class (GSSAPI)
rxrpc: rxgk: Implement connection rekeying

 Documentation/crypto/index.rst   |    1 +
 Documentation/crypto/krb5.rst    |  262 +++++++
 crypto/Kconfig                   |   13 +
 crypto/Makefile                  |    3 +
 crypto/krb5/Kconfig              |   26 +
 crypto/krb5/Makefile             |   18 +
 crypto/krb5/internal.h           |  257 +++++++
 crypto/krb5/krb5_api.c           |  452 ++++++++++++
 crypto/krb5/krb5_kdf.c           |  145 ++++
 crypto/krb5/rfc3961_simplified.c |  791 ++++++++++++++++++++
 crypto/krb5/rfc3962_aes.c        |  115 +++
 crypto/krb5/rfc6803_camellia.c   |  237 ++++++
 crypto/krb5/rfc8009_aes2.c       |  431 +++++++++++
 crypto/krb5/selftest.c           |  544 ++++++++++++++
 crypto/krb5/selftest_data.c      |  291 ++++++++
 crypto/krb5enc.c                 |  491 +++++++++++++
 crypto/testmgr.c                 |   16 +
 crypto/testmgr.h                 |  401 ++++++++++
 fs/afs/misc.c                    |   13 +
 include/crypto/krb5.h            |  167 +++++
 include/keys/rxrpc-type.h        |   17 +
 include/trace/events/rxrpc.h     |   36 +
 include/uapi/linux/rxrpc.h       |   17 +
 net/rxrpc/Kconfig                |   10 +
 net/rxrpc/Makefile               |    5 +-
 net/rxrpc/ar-internal.h          |   22 +
 net/rxrpc/conn_event.c           |    2 +-
 net/rxrpc/conn_object.c          |    1 +
 net/rxrpc/key.c                  |  183 +++++
 net/rxrpc/output.c               |    2 +-
 net/rxrpc/protocol.h             |   20 +
 net/rxrpc/rxgk.c                 | 1170 ++++++++++++++++++++++++++++++
 net/rxrpc/rxgk_app.c             |  284 ++++++++
 net/rxrpc/rxgk_common.h          |  140 ++++
 net/rxrpc/rxgk_kdf.c             |  287 ++++++++
 net/rxrpc/rxkad.c                |    6 +-
 net/rxrpc/security.c             |    3 +
 37 files changed, 6874 insertions(+), 5 deletions(-)
 create mode 100644 Documentation/crypto/krb5.rst
 create mode 100644 crypto/krb5/Kconfig
 create mode 100644 crypto/krb5/Makefile
 create mode 100644 crypto/krb5/internal.h
 create mode 100644 crypto/krb5/krb5_api.c
 create mode 100644 crypto/krb5/krb5_kdf.c
 create mode 100644 crypto/krb5/rfc3961_simplified.c
 create mode 100644 crypto/krb5/rfc3962_aes.c
 create mode 100644 crypto/krb5/rfc6803_camellia.c
 create mode 100644 crypto/krb5/rfc8009_aes2.c
 create mode 100644 crypto/krb5/selftest.c
 create mode 100644 crypto/krb5/selftest_data.c
 create mode 100644 crypto/krb5enc.c
 create mode 100644 include/crypto/krb5.h
 create mode 100644 net/rxrpc/rxgk.c
 create mode 100644 net/rxrpc/rxgk_app.c
 create mode 100644 net/rxrpc/rxgk_common.h
 create mode 100644 net/rxrpc/rxgk_kdf.c