Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
LU-2800 compat: remove crypto shims
[fs/lustre-release.git] / lustre / ptlrpc / gss / gss_mech_switch.c
diff --git a/lustre/ptlrpc/gss/gss_mech_switch.c b/lustre/ptlrpc/gss/gss_mech_switch.c
index 6e6386f..7c5b830 100644 (file)
--- a/lustre/ptlrpc/gss/gss_mech_switch.c
+++ b/lustre/ptlrpc/gss/gss_mech_switch.c
@@ -1,9 +1,10 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * Modifications for Lustre
- * Copyright 2004 - 2006, Cluster File Systems, Inc.
- * All rights reserved
+ *
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Copyright (c) 2012, Intel Corporation.
+ *
  * Author: Eric Mei <ericm@clusterfs.com>
  */
 
@@ -42,9 +43,6 @@
  *
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_SEC
 #ifdef __KERNEL__
 #include <linux/init.h>
@@ -68,47 +66,47 @@
 #include "gss_api.h"
 
 static CFS_LIST_HEAD(registered_mechs);
-static spinlock_t registered_mechs_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(registered_mechs_lock);
 
 int lgss_mech_register(struct gss_api_mech *gm)
 {
-        spin_lock(&registered_mechs_lock);
-        list_add(&gm->gm_list, &registered_mechs);
-        spin_unlock(&registered_mechs_lock);
-        CWARN("Register %s mechanism\n", gm->gm_name);
-        return 0;
+       spin_lock(&registered_mechs_lock);
+       cfs_list_add(&gm->gm_list, &registered_mechs);
+       spin_unlock(&registered_mechs_lock);
+       CWARN("Register %s mechanism\n", gm->gm_name);
+       return 0;
 }
 
 void lgss_mech_unregister(struct gss_api_mech *gm)
 {
-        spin_lock(&registered_mechs_lock);
-        list_del(&gm->gm_list);
-        spin_unlock(&registered_mechs_lock);
-        CWARN("Unregister %s mechanism\n", gm->gm_name);
+       spin_lock(&registered_mechs_lock);
+       cfs_list_del(&gm->gm_list);
+       spin_unlock(&registered_mechs_lock);
+       CWARN("Unregister %s mechanism\n", gm->gm_name);
 }
 
 
 struct gss_api_mech *lgss_mech_get(struct gss_api_mech *gm)
 {
-        __module_get(gm->gm_owner);
-        return gm;
+       __module_get(gm->gm_owner);
+       return gm;
 }
 
 struct gss_api_mech *lgss_name_to_mech(char *name)
 {
-        struct gss_api_mech *pos, *gm = NULL;
-
-        spin_lock(&registered_mechs_lock);
-        list_for_each_entry(pos, &registered_mechs, gm_list) {
-                if (0 == strcmp(name, pos->gm_name)) {
-                        if (!try_module_get(pos->gm_owner))
-                                continue;
-                        gm = pos;
-                        break;
-                }
-        }
-        spin_unlock(&registered_mechs_lock);
-        return gm;
+       struct gss_api_mech *pos, *gm = NULL;
+
+       spin_lock(&registered_mechs_lock);
+       cfs_list_for_each_entry(pos, &registered_mechs, gm_list) {
+               if (0 == strcmp(name, pos->gm_name)) {
+                       if (!try_module_get(pos->gm_owner))
+                               continue;
+                       gm = pos;
+                       break;
+               }
+       }
+       spin_unlock(&registered_mechs_lock);
+       return gm;
 
 }
 
@@ -126,26 +124,26 @@ int mech_supports_subflavor(struct gss_api_mech *gm, __u32 subflavor)
 
 struct gss_api_mech *lgss_subflavor_to_mech(__u32 subflavor)
 {
-        struct gss_api_mech *pos, *gm = NULL;
-
-        spin_lock(&registered_mechs_lock);
-        list_for_each_entry(pos, &registered_mechs, gm_list) {
-                if (!try_module_get(pos->gm_owner))
-                        continue;
-                if (!mech_supports_subflavor(pos, subflavor)) {
-                        module_put(pos->gm_owner);
-                        continue;
-                }
-                gm = pos;
-                break;
-        }
-        spin_unlock(&registered_mechs_lock);
-        return gm;
+       struct gss_api_mech *pos, *gm = NULL;
+
+       spin_lock(&registered_mechs_lock);
+       cfs_list_for_each_entry(pos, &registered_mechs, gm_list) {
+               if (!try_module_get(pos->gm_owner))
+                       continue;
+               if (!mech_supports_subflavor(pos, subflavor)) {
+                       module_put(pos->gm_owner);
+                       continue;
+               }
+               gm = pos;
+               break;
+       }
+       spin_unlock(&registered_mechs_lock);
+       return gm;
 }
 
 void lgss_mech_put(struct gss_api_mech *gm)
 {
-        module_put(gm->gm_owner);
+       module_put(gm->gm_owner);
 }
 
 /* The mech could probably be determined from the token instead, but it's just
@@ -213,6 +211,8 @@ __u32 lgss_inquire_context(struct gss_ctx *context_handle,
 __u32 lgss_get_mic(struct gss_ctx *context_handle,
                    int msgcnt,
                    rawobj_t *msg,
+                   int iovcnt,
+                   lnet_kiov_t *iovs,
                    rawobj_t *mic_token)
 {
         LASSERT(context_handle);
@@ -224,6 +224,8 @@ __u32 lgss_get_mic(struct gss_ctx *context_handle,
                 ->gss_get_mic(context_handle,
                               msgcnt,
                               msg,
+                              iovcnt,
+                              iovs,
                               mic_token);
 }
 
@@ -231,6 +233,8 @@ __u32 lgss_get_mic(struct gss_ctx *context_handle,
 __u32 lgss_verify_mic(struct gss_ctx *context_handle,
                       int msgcnt,
                       rawobj_t *msg,
+                      int iovcnt,
+                      lnet_kiov_t *iovs,
                       rawobj_t *mic_token)
 {
         LASSERT(context_handle);
@@ -242,14 +246,16 @@ __u32 lgss_verify_mic(struct gss_ctx *context_handle,
                 ->gss_verify_mic(context_handle,
                                  msgcnt,
                                  msg,
+                                 iovcnt,
+                                 iovs,
                                  mic_token);
 }
 
-#if 0
 __u32 lgss_wrap(struct gss_ctx *context_handle,
-                __u32 qop,
-                rawobj_buf_t *inbuf,
-                rawobj_t *outbuf)
+                rawobj_t *gsshdr,
+                rawobj_t *msg,
+                int msg_buflen,
+                rawobj_t *out_token)
 {
         LASSERT(context_handle);
         LASSERT(context_handle->mech_type);
@@ -257,50 +263,62 @@ __u32 lgss_wrap(struct gss_ctx *context_handle,
         LASSERT(context_handle->mech_type->gm_ops->gss_wrap);
 
         return context_handle->mech_type->gm_ops
-                ->gss_wrap(context_handle, qop, inbuf, outbuf);
+                ->gss_wrap(context_handle, gsshdr, msg, msg_buflen, out_token);
 }
-#endif
 
-__u32 lgss_wrap(struct gss_ctx *context_handle,
-                rawobj_t *msg,
-                int msg_buflen,
-                rawobj_t *out_token)
+__u32 lgss_unwrap(struct gss_ctx *context_handle,
+                  rawobj_t *gsshdr,
+                  rawobj_t *token,
+                  rawobj_t *out_msg)
 {
         LASSERT(context_handle);
         LASSERT(context_handle->mech_type);
         LASSERT(context_handle->mech_type->gm_ops);
-        LASSERT(context_handle->mech_type->gm_ops->gss_wrap);
+        LASSERT(context_handle->mech_type->gm_ops->gss_unwrap);
 
         return context_handle->mech_type->gm_ops
-                ->gss_wrap(context_handle, msg, msg_buflen, out_token);
+                ->gss_unwrap(context_handle, gsshdr, token, out_msg);
 }
 
-__u32 lgss_unwrap(struct gss_ctx *context_handle,
-                  rawobj_t *token,
-                  rawobj_t *out_msg)
+
+__u32 lgss_prep_bulk(struct gss_ctx *context_handle,
+                     struct ptlrpc_bulk_desc *desc)
 {
         LASSERT(context_handle);
         LASSERT(context_handle->mech_type);
         LASSERT(context_handle->mech_type->gm_ops);
-        LASSERT(context_handle->mech_type->gm_ops->gss_unwrap);
+        LASSERT(context_handle->mech_type->gm_ops->gss_prep_bulk);
 
         return context_handle->mech_type->gm_ops
-                ->gss_unwrap(context_handle, token, out_msg);
+                ->gss_prep_bulk(context_handle, desc);
 }
 
+__u32 lgss_wrap_bulk(struct gss_ctx *context_handle,
+                     struct ptlrpc_bulk_desc *desc,
+                     rawobj_t *token,
+                     int adj_nob)
+{
+        LASSERT(context_handle);
+        LASSERT(context_handle->mech_type);
+        LASSERT(context_handle->mech_type->gm_ops);
+        LASSERT(context_handle->mech_type->gm_ops->gss_wrap_bulk);
+
+        return context_handle->mech_type->gm_ops
+                ->gss_wrap_bulk(context_handle, desc, token, adj_nob);
+}
 
-__u32 lgss_plain_encrypt(struct gss_ctx *ctx,
-                         int length,
-                         void *in_buf,
-                         void *out_buf)
+__u32 lgss_unwrap_bulk(struct gss_ctx *context_handle,
+                       struct ptlrpc_bulk_desc *desc,
+                       rawobj_t *token,
+                       int adj_nob)
 {
-        LASSERT(ctx);
-        LASSERT(ctx->mech_type);
-        LASSERT(ctx->mech_type->gm_ops);
-        LASSERT(ctx->mech_type->gm_ops->gss_plain_encrypt);
+        LASSERT(context_handle);
+        LASSERT(context_handle->mech_type);
+        LASSERT(context_handle->mech_type->gm_ops);
+        LASSERT(context_handle->mech_type->gm_ops->gss_unwrap_bulk);
 
-        return ctx->mech_type->gm_ops
-                ->gss_plain_encrypt(ctx, length, in_buf, out_buf);
+        return context_handle->mech_type->gm_ops
+                ->gss_unwrap_bulk(context_handle, desc, token, adj_nob);
 }
 
 /* gss_delete_sec_context: free all resources associated with context_handle.
Lustre primary development and releases