[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
CVS gsasl/lib/src
From: |
gsasl-commit |
Subject: |
CVS gsasl/lib/src |
Date: |
Fri, 24 Sep 2004 02:38:16 +0200 |
Update of /home/cvs/gsasl/lib/src
In directory dopio:/tmp/cvs-serv7805/lib/src
Modified Files:
common.c gsasl.h.in init.c internal.h listmech.c register.c
suggest.c supportp.c xcode.c xstart.c xstep.c
Log Message:
Make mechanism interface public.
--- /home/cvs/gsasl/lib/src/common.c 2004/09/24 00:31:09 1.26
+++ /home/cvs/gsasl/lib/src/common.c 2004/09/24 00:38:10 1.27
@@ -34,7 +34,7 @@
const char *GSASL_VALID_MECHANISM_CHARACTERS =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
-_Gsasl_mechanism _gsasl_all_mechanisms[] = {
+Gsasl_mechanism _gsasl_all_mechanisms[] = {
#ifdef USE_ANONYMOUS
{_GSASL_ANONYMOUS_NAME,
{
--- /home/cvs/gsasl/lib/src/gsasl.h.in 2004/09/23 00:49:14 1.24
+++ /home/cvs/gsasl/lib/src/gsasl.h.in 2004/09/24 00:38:10 1.25
@@ -191,11 +191,51 @@
typedef int (*Gsasl_callback_function) (Gsasl * ctx, Gsasl_session * sctx,
Gsasl_property prop);
+ /* Mechanism function prototypes. */
+ typedef int (*Gsasl_init_function) (Gsasl * ctx);
+ typedef void (*Gsasl_done_function) (Gsasl * ctx);
+ typedef int (*Gsasl_start_function) (Gsasl_session * sctx, void **mech_data);
+ typedef int (*Gsasl_step_function) (Gsasl_session * sctx,
+ void *mech_data,
+ const char *input, size_t input_len,
+ char **output, size_t * output_len);
+ typedef int (*Gsasl_finish_function) (Gsasl_session * sctx, void *mech_data);
+ typedef int (*Gsasl_code_function) (Gsasl_session * sctx,
+ void *mech_data,
+ const char *input, size_t input_len,
+ char **output, size_t * output_len);
+
+ /* Collection of mechanism functions for either client or server. */
+ struct Gsasl_mechanism_functions
+ {
+ Gsasl_init_function init;
+ Gsasl_done_function done;
+ Gsasl_start_function start;
+ Gsasl_step_function step;
+ Gsasl_finish_function finish;
+ Gsasl_code_function encode;
+ Gsasl_code_function decode;
+ };
+ typedef struct Gsasl_mechanism_functions Gsasl_mechanism_functions;
+
+ /* Information about a mechanism. */
+ struct Gsasl_mechanism
+ {
+ const char *name;
+
+ struct Gsasl_mechanism_functions client;
+ struct Gsasl_mechanism_functions server;
+ };
+ typedef struct Gsasl_mechanism Gsasl_mechanism;
+
/* Library entry and exit points: version.c, init.c, done.c */
extern int gsasl_init (Gsasl ** ctx);
extern void gsasl_done (Gsasl * ctx);
extern const char *gsasl_check_version (const char *req_version);
+ /* Let library know about a new mechanism. */
+ extern int gsasl_register (Gsasl * ctx, const Gsasl_mechanism * mech);
+
/* Callback handling: callback.c */
extern void gsasl_application_data_set (Gsasl * ctx, void *appdata);
extern void *gsasl_application_data_get (Gsasl * ctx);
--- /home/cvs/gsasl/lib/src/init.c 2004/09/17 21:27:12 1.6
+++ /home/cvs/gsasl/lib/src/init.c 2004/09/24 00:38:10 1.7
@@ -25,7 +25,7 @@
#include <gc.h>
/* See common.c. */
-extern _Gsasl_mechanism _gsasl_all_mechanisms[];
+extern Gsasl_mechanism _gsasl_all_mechanisms[];
/**
* gsasl_init:
--- /home/cvs/gsasl/lib/src/internal.h 2004/09/24 00:31:09 1.15
+++ /home/cvs/gsasl/lib/src/internal.h 2004/09/24 00:38:10 1.16
@@ -35,53 +35,13 @@
/* Get strlen, strcpy, ... */
# include <string.h>
-/* Mechanism function prototypes. */
-typedef int (*_Gsasl_init_function) (Gsasl * ctx);
-typedef void (*_Gsasl_done_function) (Gsasl * ctx);
-typedef int (*_Gsasl_start_function) (Gsasl_session * sctx, void **mech_data);
-typedef int (*_Gsasl_step_function) (Gsasl_session * sctx,
- void *mech_data,
- const char *input, size_t input_len,
- char **output, size_t * output_len);
-typedef int (*_Gsasl_finish_function) (Gsasl_session * sctx, void *mech_data);
-typedef int (*_Gsasl_code_function) (Gsasl_session * sctx,
- void *mech_data,
- const char *input, size_t input_len,
- char **output, size_t * output_len);
-
-/* Collection of mechanism functions for either client or server. */
-struct _Gsasl_mechanism_functions
-{
- _Gsasl_init_function init;
- _Gsasl_done_function done;
- _Gsasl_start_function start;
- _Gsasl_step_function step;
- _Gsasl_finish_function finish;
- _Gsasl_code_function encode;
- _Gsasl_code_function decode;
-};
-
-/* Information about a mechanism. */
-struct _Gsasl_mechanism
-{
- const char *name;
-
- struct _Gsasl_mechanism_functions client;
- struct _Gsasl_mechanism_functions server;
-};
-typedef struct _Gsasl_mechanism _Gsasl_mechanism;
-
-/* Move to gsasl.h once all mechanisms have been rewritten to use
- allocating API. See register.c. */
-extern int gsasl_register (Gsasl * ctx, const _Gsasl_mechanism * mech);
-
/* Main library handle. */
struct Gsasl
{
size_t n_client_mechs;
- _Gsasl_mechanism *client_mechs;
+ Gsasl_mechanism *client_mechs;
size_t n_server_mechs;
- _Gsasl_mechanism *server_mechs;
+ Gsasl_mechanism *server_mechs;
void *application_data;
/* Global callback. */
Gsasl_callback_function cb;
@@ -124,7 +84,7 @@
{
Gsasl *ctx;
int clientp;
- _Gsasl_mechanism *mech;
+ Gsasl_mechanism *mech;
void *application_data;
void *mech_data;
/* Session specific callback. If NULL, use global callback in
--- /home/cvs/gsasl/lib/src/listmech.c 2004/04/15 22:02:50 1.2
+++ /home/cvs/gsasl/lib/src/listmech.c 2004/09/24 00:38:10 1.3
@@ -23,7 +23,7 @@
static int
_gsasl_listmech (Gsasl * ctx,
- _Gsasl_mechanism * mechs,
+ Gsasl_mechanism * mechs,
size_t n_mechs, char **out, int clientp)
{
Gsasl_session *sctx;
--- /home/cvs/gsasl/lib/src/register.c 2004/09/18 17:35:24 1.2
+++ /home/cvs/gsasl/lib/src/register.c 2004/09/24 00:38:10 1.3
@@ -38,9 +38,9 @@
* Return value: GSASL_OK iff successful, otherwise GSASL_MALLOC_ERROR.
**/
int
-gsasl_register (Gsasl * ctx, const _Gsasl_mechanism * mech)
+gsasl_register (Gsasl * ctx, const Gsasl_mechanism * mech)
{
- _Gsasl_mechanism *tmp;
+ Gsasl_mechanism *tmp;
#ifdef USE_CLIENT
if (mech->client.init == NULL || mech->client.init (ctx) == GSASL_OK)
--- /home/cvs/gsasl/lib/src/suggest.c 2004/06/06 20:02:52 1.4
+++ /home/cvs/gsasl/lib/src/suggest.c 2004/09/24 00:38:10 1.5
@@ -23,7 +23,7 @@
static const char *
_gsasl_suggest_mechanism (Gsasl * ctx,
- _Gsasl_mechanism * mechs,
+ Gsasl_mechanism * mechs,
size_t n_mechs,
const char *mechlist,
int (*start_mech_func) (Gsasl * ctx,
--- /home/cvs/gsasl/lib/src/supportp.c 2004/04/15 22:02:50 1.2
+++ /home/cvs/gsasl/lib/src/supportp.c 2004/09/24 00:38:10 1.3
@@ -22,7 +22,7 @@
#include "internal.h"
static int
-_gsasl_support_p (_Gsasl_mechanism * mechs, size_t n_mechs, const char *name)
+_gsasl_support_p (Gsasl_mechanism * mechs, size_t n_mechs, const char *name)
{
size_t i;
--- /home/cvs/gsasl/lib/src/xcode.c 2004/09/23 00:20:57 1.4
+++ /home/cvs/gsasl/lib/src/xcode.c 2004/09/24 00:38:10 1.5
@@ -23,7 +23,7 @@
static int
_gsasl_code (Gsasl_session * sctx,
- _Gsasl_code_function code,
+ Gsasl_code_function code,
const char *input, size_t input_len,
char **output, size_t * output_len)
{
@@ -64,7 +64,7 @@
const char *input, size_t input_len,
char **output, size_t * output_len)
{
- _Gsasl_code_function code;
+ Gsasl_code_function code;
if (sctx->clientp)
code = sctx->mech->client.encode;
@@ -96,7 +96,7 @@
const char *input, size_t input_len,
char **output, size_t * output_len)
{
- _Gsasl_code_function code;
+ Gsasl_code_function code;
if (sctx->clientp)
code = sctx->mech->client.decode;
--- /home/cvs/gsasl/lib/src/xstart.c 2004/04/15 22:02:50 1.2
+++ /home/cvs/gsasl/lib/src/xstart.c 2004/09/24 00:38:10 1.3
@@ -21,9 +21,9 @@
#include "internal.h"
-static _Gsasl_mechanism *
+static Gsasl_mechanism *
_gsasl_find_mechanism (const char *mech,
- size_t n_mechs, _Gsasl_mechanism * mechs)
+ size_t n_mechs, Gsasl_mechanism * mechs)
{
size_t i;
@@ -41,9 +41,9 @@
_gsasl_setup (Gsasl * ctx,
const char *mech,
Gsasl_session * sctx,
- size_t n_mechs, _Gsasl_mechanism * mechs, int clientp)
+ size_t n_mechs, Gsasl_mechanism * mechs, int clientp)
{
- _Gsasl_mechanism *mechptr = NULL;
+ Gsasl_mechanism *mechptr = NULL;
int res;
mechptr = _gsasl_find_mechanism (mech, n_mechs, mechs);
@@ -78,7 +78,7 @@
_gsasl_start (Gsasl * ctx,
const char *mech,
Gsasl_session ** sctx,
- size_t n_mechs, _Gsasl_mechanism * mechs, int clientp)
+ size_t n_mechs, Gsasl_mechanism * mechs, int clientp)
{
Gsasl_session *out;
int res;
--- /home/cvs/gsasl/lib/src/xstep.c 2004/09/24 00:31:09 1.5
+++ /home/cvs/gsasl/lib/src/xstep.c 2004/09/24 00:38:10 1.6
@@ -50,7 +50,7 @@
const char *input, size_t input_len,
char **output, size_t * output_len)
{
- _Gsasl_step_function step;
+ Gsasl_step_function step;
if (sctx == NULL)
return GSASL_INVALID_HANDLE;
- CVS gsasl/lib/src, (continued)
- CVS gsasl/lib/src, gsasl-commit, 2004/09/20
- CVS gsasl/lib/src, gsasl-commit, 2004/09/22
- CVS gsasl/lib/src, gsasl-commit, 2004/09/22
- CVS gsasl/lib/src, gsasl-commit, 2004/09/22
- CVS gsasl/lib/src, gsasl-commit, 2004/09/22
- CVS gsasl/lib/src, gsasl-commit, 2004/09/22
- CVS gsasl/lib/src, gsasl-commit, 2004/09/22
- CVS gsasl/lib/src, gsasl-commit, 2004/09/23
- CVS gsasl/lib/src, gsasl-commit, 2004/09/23
- CVS gsasl/lib/src, gsasl-commit, 2004/09/23
- CVS gsasl/lib/src,
gsasl-commit <=
- CVS gsasl/lib/src, gsasl-commit, 2004/09/23
- CVS gsasl/lib/src, gsasl-commit, 2004/09/23
- CVS gsasl/lib/src, gsasl-commit, 2004/09/23
- CVS gsasl/lib/src, gsasl-commit, 2004/09/23
- CVS gsasl/lib/src, gsasl-commit, 2004/09/23
- CVS gsasl/lib/src, gsasl-commit, 2004/09/23
- CVS gsasl/lib/src, gsasl-commit, 2004/09/24
- CVS gsasl/lib/src, gsasl-commit, 2004/09/24
- CVS gsasl/lib/src, gsasl-commit, 2004/09/24
- CVS gsasl/lib/src, gsasl-commit, 2004/09/24