-/*
- * Modifications for Lustre
- *
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- *
- * Author: Eric Mei <ericm@clusterfs.com>
- */
+#ifndef PTLRPC_GSS_CRYPTO_H
+#define PTLRPC_GSS_CRYPTO_H
-/*
- * linux/include/linux/sunrpc/gss_krb5_types.h
- *
- * 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.
- * All rights reserved.
- *
- * Andy Adamson <andros@umich.edu>
- * Bruce Fields <bfields@umich.edu>
- */
+#include <linux/scatterlist.h>
+
+#include "gss_internal.h"
+
+#include <crypto/skcipher.h>
/*
- * Copyright 1995 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- * require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission. Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose. It is provided "as is" without express
- * or implied warranty.
+ * linux v4.19-rc2-66-gb350bee5ea0f
+ * crypto: skcipher - Introduce crypto_sync_skcipher
*
+ * crypto_sync_skcipher will replace crypto_blkcipher so start using
+ * crypto_sync_skcipher and provide wrappers for older kernels
*/
+#ifdef SYNC_SKCIPHER_REQUEST_ON_STACK
-#ifndef PTLRPC_GSS_UTILS_H
-#define PTLRPC_GSS_UTILS_H
+#define crypto_skcipher_encrypt_iv(desc, dst, src, blocksize) \
+ crypto_skcipher_encrypt((desc))
-#include "gss_internal.h"
+#define crypto_skcipher_decrypt_iv(desc, dst, src, blocksize) \
+ crypto_skcipher_decrypt((desc))
+
+#define skcipher_request_set_crypt_iv(d)
+
+#else /* ! SYNC_SKCIPHER_REQUEST_ON_STACK */
+
+#ifdef HAVE_CRYPTO_ALLOC_SKCIPHER
+
+#define crypto_sync_skcipher crypto_skcipher
+
+#define SYNC_SKCIPHER_REQUEST_ON_STACK SKCIPHER_REQUEST_ON_STACK
+
+#define skcipher_request_set_sync_tfm skcipher_request_set_tfm
+
+#define skcipher_request_set_crypt_iv(d)
+
+#define crypto_sync_skcipher_blocksize crypto_skcipher_blocksize
+
+#define crypto_sync_skcipher_setkey crypto_skcipher_setkey
+
+#define crypto_alloc_sync_skcipher crypto_alloc_skcipher
+
+#define crypto_free_sync_skcipher crypto_free_skcipher
+
+#define crypto_sync_skcipher_ivsize crypto_skcipher_ivsize
+
+#define crypto_skcipher_encrypt_iv(desc, dst, src, blocksize) \
+ crypto_skcipher_encrypt((desc))
+
+#define crypto_skcipher_decrypt_iv(desc, dst, src, blocksize) \
+ crypto_skcipher_decrypt((desc))
+
+#define skcipher_request_zero(req) /* nop */
+
+#else /* ! HAVE_CRYPTO_ALLOC_SKCIPHER */
+
+#define crypto_sync_skcipher crypto_blkcipher
+
+#define SYNC_SKCIPHER_REQUEST_ON_STACK(name, tfm) \
+ struct blkcipher_desc __##name##_obj, *name = (void *)&__##name##_obj
+
+#define skcipher_request_set_sync_tfm(d, _tfm) \
+ do { (d)->tfm = _tfm; } while (0)
+
+#define skcipher_request_set_callback(d, f, c, data) \
+ do { (d)->flags = f; } while (0)
+
+#define skcipher_request_set_crypt(d, src, dst, cryptlen, iv) \
+ do { (d)->info = iv; } while (0)
+
+#define skcipher_request_set_crypt_iv(d) \
+ do { (d)->info = crypto_blkcipher_crt((d)->tfm)->iv; } while (0)
+
+#define crypto_sync_skcipher_blocksize(tfm) \
+ crypto_blkcipher_blocksize((tfm))
+
+#define crypto_sync_skcipher_setkey(tfm, key, keylen) \
+ crypto_blkcipher_setkey((tfm), (key), (keylen))
+
+#define crypto_alloc_sync_skcipher(name, type, mask) \
+ crypto_alloc_blkcipher((name), (type), (mask))
+
+#define crypto_free_sync_skcipher(tfm) \
+ crypto_free_blkcipher((tfm))
+
+#define crypto_sync_skcipher_ivsize(tfm) \
+ crypto_blkcipher_ivsize((tfm))
+
+#define crypto_skcipher_encrypt_iv(desc, dst, src, len) \
+ crypto_blkcipher_encrypt_iv((desc), (dst), (src), (len))
+
+#define crypto_skcipher_decrypt_iv(desc, dst, src, len) \
+ crypto_blkcipher_decrypt_iv((desc), (dst), (src), (len))
+
+#define skcipher_request_zero(req) /* nop */
+
+#endif /* HAVE_CRYPTO_ALLOC_SKCIPHER */
+#endif /* SYNC_SKCIPHER_REQUEST_ON_STACK */
struct gss_keyblock {
- rawobj_t kb_key;
- struct crypto_blkcipher *kb_tfm;
+ rawobj_t kb_key;
+ struct crypto_sync_skcipher *kb_tfm;
};
-int gss_keyblock_init(struct gss_keyblock *kb, char *alg_name,
+int gss_keyblock_init(struct gss_keyblock *kb, const char *alg_name,
const int alg_mode);
void gss_keyblock_free(struct gss_keyblock *kb);
int gss_keyblock_dup(struct gss_keyblock *new, struct gss_keyblock *kb);
int gss_setup_sgtable(struct sg_table *sgt, struct scatterlist *prealloc_sg,
const void *buf, unsigned int buf_len);
void gss_teardown_sgtable(struct sg_table *sgt);
-int gss_crypt_generic(struct crypto_blkcipher *tfm, int decrypt, void *iv,
- void *in, void *out, int length);
-int gss_digest_hmac(struct crypto_hash *tfm, rawobj_t *key, rawobj_t *hdr,
- int msgcnt, rawobj_t *msgs, int iovcnt, lnet_kiov_t *iovs,
- rawobj_t *cksum);
-int gss_digest_norm(struct crypto_hash *tfm, struct gss_keyblock *kb,
- rawobj_t *hdr, int msgcnt, rawobj_t *msgs, int iovcnt,
- lnet_kiov_t *iovs, rawobj_t *cksum);
+int gss_crypt_generic(struct crypto_sync_skcipher *tfm, int decrypt,
+ const void *iv, const void *in, void *out, size_t length);
+int gss_digest_hash(struct ahash_request *req, rawobj_t *hdr,
+ int msgcnt, rawobj_t *msgs, int iovcnt,
+ struct bio_vec *iovs);
+int gss_digest_hash_compat(struct ahash_request *req,
+ rawobj_t *hdr, int msgcnt, rawobj_t *msgs,
+ int iovcnt, struct bio_vec *iovs);
int gss_add_padding(rawobj_t *msg, int msg_buflen, int blocksize);
-int gss_crypt_rawobjs(struct crypto_blkcipher *tfm, int use_internal_iv,
+int gss_crypt_rawobjs(struct crypto_sync_skcipher *tfm, __u8 *iv,
int inobj_cnt, rawobj_t *inobjs, rawobj_t *outobj,
int enc);
-#endif /* PTLRPC_GSS_UTILS_H */
+#endif /* PTLRPC_GSS_CRYPTO_H */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff