Shuffle around some gss-krb5 entry points to eliminate four mostly

content-free source files and better separate IOV stuff from non-IOV
stuff.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24874 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 0ff0d39b2c464554492520629b32f8c682897744..5998fc08c392a3fddad230fe2c7e0cecd7f13c44 100644 (file)
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -74,19 +74,15 @@ SRCS = \
        $(srcdir)/rel_oid.c \
        $(srcdir)/rel_name.c \
        $(srcdir)/s4u_gss_glue.c \
-       $(srcdir)/seal.c \
        $(srcdir)/set_allowable_enctypes.c \
        $(srcdir)/ser_sctx.c \
        $(srcdir)/set_ccache.c \
-       $(srcdir)/sign.c \
        $(srcdir)/store_cred.c \
-       $(srcdir)/unseal.c \
        $(srcdir)/util_cksum.c \
        $(srcdir)/util_crypt.c \
        $(srcdir)/util_seed.c \
        $(srcdir)/util_seqnum.c \
        $(srcdir)/val_cred.c \
-       $(srcdir)/verify.c \
        $(srcdir)/wrap_size_limit.c 
 
 
@@ -128,19 +124,15 @@ OBJS = \
        $(OUTPRE)rel_oid.$(OBJEXT) \
        $(OUTPRE)rel_name.$(OBJEXT) \
        $(OUTPRE)s4u_gss_glue.$(OBJEXT) \
-       $(OUTPRE)seal.$(OBJEXT) \
        $(OUTPRE)set_allowable_enctypes.$(OBJEXT) \
        $(OUTPRE)ser_sctx.$(OBJEXT) \
        $(OUTPRE)set_ccache.$(OBJEXT) \
-       $(OUTPRE)sign.$(OBJEXT) \
        $(OUTPRE)store_cred.$(OBJEXT) \
-       $(OUTPRE)unseal.$(OBJEXT) \
        $(OUTPRE)util_cksum.$(OBJEXT) \
        $(OUTPRE)util_crypt.$(OBJEXT) \
        $(OUTPRE)util_seed.$(OBJEXT) \
        $(OUTPRE)util_seqnum.$(OBJEXT) \
        $(OUTPRE)val_cred.$(OBJEXT) \
-       $(OUTPRE)verify.$(OBJEXT) \
        $(OUTPRE)wrap_size_limit.$(OBJEXT) \
        $(OUTPRE)gssapi_err_krb5.$(OBJEXT)
 
@@ -185,19 +177,15 @@ STLIBOBJS = \
        rel_oid.o \
        rel_name.o \
        s4u_gss_glue.o \
-       seal.o \
        set_allowable_enctypes.o \
        ser_sctx.o \
        set_ccache.o \
-       sign.o \
        store_cred.o \
-       unseal.o \
        util_cksum.o \
        util_crypt.o \
        util_seed.o \
        util_seqnum.o \
        val_cred.o \
-       verify.o \
        wrap_size_limit.o \
        gssapi_err_krb5.o
 

diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
index 46accf1ac8ee4dc76f98625433af51c76494928b..5354434cce640b1a643af11ba03fe92bf5f49f86 100644 (file)
--- a/src/lib/gssapi/krb5/k5seal.c
+++ b/src/lib/gssapi/krb5/k5seal.c
@@ -392,3 +392,34 @@ kg_seal(minor_status, context_handle, conf_req_flag, qop_req,
     *minor_status = 0;
     return(GSS_S_COMPLETE);
 }
+
+OM_uint32
+krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
+              qop_req, input_message_buffer, conf_state,
+              output_message_buffer)
+    OM_uint32           *minor_status;
+    gss_ctx_id_t        context_handle;
+    int                 conf_req_flag;
+    gss_qop_t           qop_req;
+    gss_buffer_t        input_message_buffer;
+    int                 *conf_state;
+    gss_buffer_t        output_message_buffer;
+{
+    return(kg_seal(minor_status, context_handle, conf_req_flag,
+                   qop_req, input_message_buffer, conf_state,
+                   output_message_buffer, KG_TOK_WRAP_MSG));
+}
+
+OM_uint32
+krb5_gss_get_mic(minor_status, context_handle, qop_req,
+                 message_buffer, message_token)
+    OM_uint32           *minor_status;
+    gss_ctx_id_t        context_handle;
+    gss_qop_t           qop_req;
+    gss_buffer_t        message_buffer;
+    gss_buffer_t        message_token;
+{
+    return(kg_seal(minor_status, context_handle, 0,
+                   qop_req, message_buffer, NULL,
+                   message_token, KG_TOK_MIC_MSG));
+}

diff --git a/src/lib/gssapi/krb5/k5sealiov.c b/src/lib/gssapi/krb5/k5sealiov.c
index 445cdc79a46341cbc78f347dddb1b37ce27c7994..8c4ec8bbaaae618e25e680af8a944e98598cd13d 100644 (file)
--- a/src/lib/gssapi/krb5/k5sealiov.c
+++ b/src/lib/gssapi/krb5/k5sealiov.c
@@ -499,3 +499,71 @@ kg_seal_iov_length(OM_uint32 *minor_status,
 
     return GSS_S_COMPLETE;
 }
+
+OM_uint32
+krb5_gss_wrap_iov(OM_uint32 *minor_status,
+                  gss_ctx_id_t context_handle,
+                  int conf_req_flag,
+                  gss_qop_t qop_req,
+                  int *conf_state,
+                  gss_iov_buffer_desc *iov,
+                  int iov_count)
+{
+    OM_uint32 major_status;
+
+    major_status = kg_seal_iov(minor_status, context_handle, conf_req_flag,
+                               qop_req, conf_state,
+                               iov, iov_count, KG_TOK_WRAP_MSG);
+
+    return major_status;
+}
+
+OM_uint32
+krb5_gss_wrap_iov_length(OM_uint32 *minor_status,
+                         gss_ctx_id_t context_handle,
+                         int conf_req_flag,
+                         gss_qop_t qop_req,
+                         int *conf_state,
+                         gss_iov_buffer_desc *iov,
+                         int iov_count)
+{
+    OM_uint32 major_status;
+
+    major_status = kg_seal_iov_length(minor_status, context_handle, conf_req_flag,
+                                      qop_req, conf_state, iov, iov_count);
+    return major_status;
+}
+
+#if 0
+OM_uint32
+krb5_gss_get_mic_iov(OM_uint32 *minor_status,
+                     gss_ctx_id_t context_handle,
+                     gss_qop_t qop_req,
+                     gss_iov_buffer_desc *iov,
+                     int iov_count)
+{
+    OM_uint32 major_status;
+
+    major_status = kg_seal_iov(minor_status, context_handle, FALSE,
+                               qop_req, NULL,
+                               iov, iov_count, KG_TOK_MIC_MSG);
+
+    return major_status;
+}
+
+OM_uint32
+krb5_gss_get_mic_iov_length(OM_uint32 *minor_status,
+                            gss_ctx_id_t context_handle,
+                            int conf_req_flag,
+                            gss_qop_t qop_req,
+                            int *conf_state,
+                            gss_iov_buffer_desc *iov,
+                            int iov_count)
+{
+    OM_uint32 major_status;
+
+    major_status = kg_seal_iov_length(minor_status, context_handle, conf_req_flag,
+                                      qop_req, conf_state, iov, iov_count);
+    return major_status;
+}
+#endif

diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
index 4e9ee7739e4cd59b6722ad95fe983d2ff4bd906c..6c5ea099711bc3b80e45694ea5a1848eb2da0c18 100644 (file)
--- a/src/lib/gssapi/krb5/k5unseal.c
+++ b/src/lib/gssapi/krb5/k5unseal.c
@@ -550,3 +550,40 @@ kg_unseal(minor_status, context_handle, input_token_buffer,
 
     return ret;
 }
+
+OM_uint32
+krb5_gss_unwrap(minor_status, context_handle,
+                input_message_buffer, output_message_buffer,
+                conf_state, qop_state)
+    OM_uint32           *minor_status;
+    gss_ctx_id_t        context_handle;
+    gss_buffer_t        input_message_buffer;
+    gss_buffer_t        output_message_buffer;
+    int                 *conf_state;
+    gss_qop_t           *qop_state;
+{
+    OM_uint32           rstat;
+
+    rstat = kg_unseal(minor_status, context_handle,
+                      input_message_buffer, output_message_buffer,
+                      conf_state, qop_state, KG_TOK_WRAP_MSG);
+    return(rstat);
+}
+
+OM_uint32
+krb5_gss_verify_mic(minor_status, context_handle,
+                    message_buffer, token_buffer,
+                    qop_state)
+    OM_uint32           *minor_status;
+    gss_ctx_id_t        context_handle;
+    gss_buffer_t        message_buffer;
+    gss_buffer_t        token_buffer;
+    gss_qop_t           *qop_state;
+{
+    OM_uint32           rstat;
+
+    rstat = kg_unseal(minor_status, context_handle,
+                      token_buffer, message_buffer,
+                      NULL, qop_state, KG_TOK_MIC_MSG);
+    return(rstat);
+}

diff --git a/src/lib/gssapi/krb5/k5unsealiov.c b/src/lib/gssapi/krb5/k5unsealiov.c
index 185389d6820b70e74d1bf192973a2d8496bcef12..f62cf79103588487e23f540399e30857bad6b621 100644 (file)
--- a/src/lib/gssapi/krb5/k5unsealiov.c
+++ b/src/lib/gssapi/krb5/k5unsealiov.c
@@ -648,3 +648,38 @@ kg_unseal_iov(OM_uint32 *minor_status,
 
     return code;
 }
+
+OM_uint32
+krb5_gss_unwrap_iov(OM_uint32 *minor_status,
+                    gss_ctx_id_t context_handle,
+                    int *conf_state,
+                    gss_qop_t *qop_state,
+                    gss_iov_buffer_desc *iov,
+                    int iov_count)
+{
+    OM_uint32 major_status;
+
+    major_status = kg_unseal_iov(minor_status, context_handle,
+                                 conf_state, qop_state,
+                                 iov, iov_count, KG_TOK_WRAP_MSG);
+
+    return major_status;
+}
+
+#if 0
+OM_uint32
+krb5_gss_verify_mic_iov(OM_uint32 *minor_status,
+                        gss_ctx_id_t context_handle,
+                        gss_qop_t *qop_state,
+                        gss_iov_buffer_desc *iov,
+                        int iov_count)
+{
+    OM_uint32 major_status;
+
+    major_status = kg_unseal_iov(minor_status, context_handle,
+                                 NULL, qop_state,
+                                 iov, iov_count, KG_TOK_WRAP_MSG);
+
+    return major_status;
+}
+#endif

diff --git a/src/lib/gssapi/krb5/seal.c b/src/lib/gssapi/krb5/seal.c
deleted file mode 100644 (file)
index 7f48c7a..0000000
--- a/src/lib/gssapi/krb5/seal.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- * Copyright 1993 by OpenVision Technologies, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OpenVision not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. OpenVision makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "gssapiP_krb5.h"
-
-/*
- * $Id$
- */
-
-/* V2 interface */
-OM_uint32
-krb5_gss_wrap(minor_status, context_handle, conf_req_flag,
-              qop_req, input_message_buffer, conf_state,
-              output_message_buffer)
-    OM_uint32           *minor_status;
-    gss_ctx_id_t        context_handle;
-    int                 conf_req_flag;
-    gss_qop_t           qop_req;
-    gss_buffer_t        input_message_buffer;
-    int                 *conf_state;
-    gss_buffer_t        output_message_buffer;
-{
-    return(kg_seal(minor_status, context_handle, conf_req_flag,
-                   qop_req, input_message_buffer, conf_state,
-                   output_message_buffer, KG_TOK_WRAP_MSG));
-}
-
-/* AEAD interfaces */
-OM_uint32
-krb5_gss_wrap_iov(OM_uint32 *minor_status,
-                  gss_ctx_id_t context_handle,
-                  int conf_req_flag,
-                  gss_qop_t qop_req,
-                  int *conf_state,
-                  gss_iov_buffer_desc *iov,
-                  int iov_count)
-{
-    OM_uint32 major_status;
-
-    major_status = kg_seal_iov(minor_status, context_handle, conf_req_flag,
-                               qop_req, conf_state,
-                               iov, iov_count, KG_TOK_WRAP_MSG);
-
-    return major_status;
-}
-
-OM_uint32
-krb5_gss_wrap_iov_length(OM_uint32 *minor_status,
-                         gss_ctx_id_t context_handle,
-                         int conf_req_flag,
-                         gss_qop_t qop_req,
-                         int *conf_state,
-                         gss_iov_buffer_desc *iov,
-                         int iov_count)
-{
-    OM_uint32 major_status;
-
-    major_status = kg_seal_iov_length(minor_status, context_handle, conf_req_flag,
-                                      qop_req, conf_state, iov, iov_count);
-    return major_status;
-}

diff --git a/src/lib/gssapi/krb5/sign.c b/src/lib/gssapi/krb5/sign.c
deleted file mode 100644 (file)
index 028423b..0000000
--- a/src/lib/gssapi/krb5/sign.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- * Copyright 1993 by OpenVision Technologies, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OpenVision not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. OpenVision makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "gssapiP_krb5.h"
-
-/*
- * $Id$
- */
-
-/* V2 interface */
-OM_uint32
-krb5_gss_get_mic(minor_status, context_handle, qop_req,
-                 message_buffer, message_token)
-    OM_uint32           *minor_status;
-    gss_ctx_id_t        context_handle;
-    gss_qop_t           qop_req;
-    gss_buffer_t        message_buffer;
-    gss_buffer_t        message_token;
-{
-    return(kg_seal(minor_status, context_handle, 0,
-                   qop_req, message_buffer, NULL,
-                   message_token, KG_TOK_MIC_MSG));
-}
-
-#if 0
-OM_uint32
-krb5_gss_get_mic_iov(OM_uint32 *minor_status,
-                     gss_ctx_id_t context_handle,
-                     gss_qop_t qop_req,
-                     gss_iov_buffer_desc *iov,
-                     int iov_count)
-{
-    OM_uint32 major_status;
-
-    major_status = kg_seal_iov(minor_status, context_handle, FALSE,
-                               qop_req, NULL,
-                               iov, iov_count, KG_TOK_MIC_MSG);
-
-    return major_status;
-}
-
-OM_uint32
-krb5_gss_get_mic_iov_length(OM_uint32 *minor_status,
-                            gss_ctx_id_t context_handle,
-                            int conf_req_flag,
-                            gss_qop_t qop_req,
-                            int *conf_state,
-                            gss_iov_buffer_desc *iov,
-                            int iov_count)
-{
-    OM_uint32 major_status;
-
-    major_status = kg_seal_iov_length(minor_status, context_handle, conf_req_flag,
-                                      qop_req, conf_state, iov, iov_count);
-    return major_status;
-}
-#endif

diff --git a/src/lib/gssapi/krb5/unseal.c b/src/lib/gssapi/krb5/unseal.c
deleted file mode 100644 (file)
index a764a45..0000000
--- a/src/lib/gssapi/krb5/unseal.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- * Copyright 1993 by OpenVision Technologies, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OpenVision not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. OpenVision makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "gssapiP_krb5.h"
-
-/*
- * $Id$
- */
-
-/* V2 interface */
-OM_uint32
-krb5_gss_unwrap(minor_status, context_handle,
-                input_message_buffer, output_message_buffer,
-                conf_state, qop_state)
-    OM_uint32           *minor_status;
-    gss_ctx_id_t        context_handle;
-    gss_buffer_t        input_message_buffer;
-    gss_buffer_t        output_message_buffer;
-    int                 *conf_state;
-    gss_qop_t           *qop_state;
-{
-    OM_uint32           rstat;
-
-    rstat = kg_unseal(minor_status, context_handle,
-                      input_message_buffer, output_message_buffer,
-                      conf_state, qop_state, KG_TOK_WRAP_MSG);
-    return(rstat);
-}
-
-/* AEAD interface */
-OM_uint32
-krb5_gss_unwrap_iov(OM_uint32 *minor_status,
-                    gss_ctx_id_t context_handle,
-                    int *conf_state,
-                    gss_qop_t *qop_state,
-                    gss_iov_buffer_desc *iov,
-                    int iov_count)
-{
-    OM_uint32 major_status;
-
-    major_status = kg_unseal_iov(minor_status, context_handle,
-                                 conf_state, qop_state,
-                                 iov, iov_count, KG_TOK_WRAP_MSG);
-
-    return major_status;
-}

diff --git a/src/lib/gssapi/krb5/verify.c b/src/lib/gssapi/krb5/verify.c
deleted file mode 100644 (file)
index e443353..0000000
--- a/src/lib/gssapi/krb5/verify.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/*
- * Copyright 1993 by OpenVision Technologies, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without fee,
- * provided that the above copyright notice appears in all copies and
- * that both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OpenVision not be used
- * in advertising or publicity pertaining to distribution of the software
- * without specific, written prior permission. OpenVision makes no
- * representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied warranty.
- *
- * OPENVISION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL OPENVISION BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- * USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include "gssapiP_krb5.h"
-
-/*
- * $Id$
- */
-
-/* V2 interface */
-OM_uint32
-krb5_gss_verify_mic(minor_status, context_handle,
-                    message_buffer, token_buffer,
-                    qop_state)
-    OM_uint32           *minor_status;
-    gss_ctx_id_t        context_handle;
-    gss_buffer_t        message_buffer;
-    gss_buffer_t        token_buffer;
-    gss_qop_t           *qop_state;
-{
-    OM_uint32           rstat;
-
-    rstat = kg_unseal(minor_status, context_handle,
-                      token_buffer, message_buffer,
-                      NULL, qop_state, KG_TOK_MIC_MSG);
-    return(rstat);
-}
-
-#if 0
-OM_uint32
-krb5_gss_verify_mic_iov(OM_uint32 *minor_status,
-                        gss_ctx_id_t context_handle,
-                        gss_qop_t *qop_state,
-                        gss_iov_buffer_desc *iov,
-                        int iov_count)
-{
-    OM_uint32 major_status;
-
-    major_status = kg_unseal_iov(minor_status, context_handle,
-                                 NULL, qop_state,
-                                 iov, iov_count, KG_TOK_WRAP_MSG);
-
-    return major_status;
-}
-#endif