gsasl-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU gsasl branch, master, updated. gsasl-1-7-1-23-g637be10


From: Simon Josefsson
Subject: [SCM] GNU gsasl branch, master, updated. gsasl-1-7-1-23-g637be10
Date: Tue, 27 Mar 2012 21:49:48 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=637be1011804db713662c1f1bd37ac20278384c0

The branch, master has been updated
       via  637be1011804db713662c1f1bd37ac20278384c0 (commit)
       via  37745a8804192589d7ac8af1ccc124328407e2d2 (commit)
      from  5b0d393d567ac125f1c4d9f32f2283193690b1a3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 637be1011804db713662c1f1bd37ac20278384c0
Author: Simon Josefsson <address@hidden>
Date:   Tue Mar 27 23:49:03 2012 +0200

    Use AUTHID for OpenID user-supplied identifier.

commit 37745a8804192589d7ac8af1ccc124328407e2d2
Author: Simon Josefsson <address@hidden>
Date:   Tue Mar 27 23:15:46 2012 +0200

    Print information after authentication.

-----------------------------------------------------------------------

Summary of changes:
 examples/smtp-server.c |    7 ++++++-
 lib/openid20/client.c  |    4 ++--
 lib/openid20/server.c  |    3 +--
 lib/src/gsasl.h        |    5 -----
 lib/src/internal.h     |    1 -
 lib/src/property.c     |    4 ----
 lib/src/xfinish.c      |    1 -
 src/callbacks.c        |   11 -----------
 8 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/examples/smtp-server.c b/examples/smtp-server.c
index cc5046e..8d6f45d 100644
--- a/examples/smtp-server.c
+++ b/examples/smtp-server.c
@@ -115,7 +115,12 @@ server_auth (FILE * fh, Gsasl_session * session)
       goto done;
     }
 
-  print (fh, "235 OK\n");
+  {
+    const char *authid = gsasl_property_fast (session, GSASL_AUTHID);
+    const char *authzid = gsasl_property_fast (session, GSASL_AUTHZID);
+    print (fh, "235 OK [authid: %s authzid: %s]\n",
+          authid ? authid : "N/A", authzid ? authzid : "N/A");
+  }
 
 done:
   free (line);
diff --git a/lib/openid20/client.c b/lib/openid20/client.c
index 5c84c8d..95836d7 100644
--- a/lib/openid20/client.c
+++ b/lib/openid20/client.c
@@ -74,9 +74,9 @@ _gsasl_openid20_client_step (Gsasl_session * sctx,
        const char *authzid = gsasl_property_get (sctx, GSASL_AUTHZID);
        const char *p;
 
-       p = gsasl_property_get (sctx, GSASL_OPENID20_AUTH_IDENTIFIER);
+       p = gsasl_property_get (sctx, GSASL_AUTHID);
        if (!p || !*p)
-         return GSASL_NO_OPENID20_AUTH_IDENTIFIER;
+         return GSASL_NO_AUTHID;
 
        res = _gsasl_gs2_generate_header (false, 'n', NULL, authzid,
                                          strlen (p), p,
diff --git a/lib/openid20/server.c b/lib/openid20/server.c
index 320516c..200a2da 100644
--- a/lib/openid20/server.c
+++ b/lib/openid20/server.c
@@ -95,8 +95,7 @@ _gsasl_openid20_server_step (Gsasl_session * sctx,
        input += headerlen;
        input_len -= headerlen;
 
-       gsasl_property_set_raw (sctx, GSASL_OPENID20_AUTH_IDENTIFIER,
-                               input, input_len);
+       gsasl_property_set_raw (sctx, GSASL_AUTHID, input, input_len);
 
        p = gsasl_property_get (sctx, GSASL_OPENID20_REDIRECT_URL);
        if (!p || !*p)
diff --git a/lib/src/gsasl.h b/lib/src/gsasl.h
index 95c0fc0..4c09805 100644
--- a/lib/src/gsasl.h
+++ b/lib/src/gsasl.h
@@ -138,8 +138,6 @@ extern "C"
    * @GSASL_NO_CB_TLS_UNIQUE: Could not get required tls-unique CB.
    * @GSASL_NO_SAML20_IDP_IDENTIFIER: Could not get required SAML IdP.
    * @GSASL_NO_SAML20_REDIRECT_URL: Could not get required redirect URL.
-   * @GSASL_NO_OPENID20_AUTH_IDENTIFIER: Could not get required OpenID
-   *   authentication identifier.
    * @GSASL_NO_OPENID20_REDIRECT_URL: Could not get required OpenID
    *   redirect URL.
    * @GSASL_GSSAPI_RELEASE_BUFFER_ERROR: GSS-API library call error.
@@ -194,7 +192,6 @@ extern "C"
     GSASL_NO_CB_TLS_UNIQUE = 65,
     GSASL_NO_SAML20_IDP_IDENTIFIER = 66,
     GSASL_NO_SAML20_REDIRECT_URL = 67,
-    GSASL_NO_OPENID20_AUTH_IDENTIFIER = 68,
     GSASL_NO_OPENID20_REDIRECT_URL = 69,
     /* Mechanism specific errors. */
     GSASL_GSSAPI_RELEASE_BUFFER_ERROR = 37,
@@ -313,7 +310,6 @@ extern "C"
    * @GSASL_SAML20_IDP_IDENTIFIER: SAML20 user IdP URL.
    * @GSASL_SAML20_REDIRECT_URL: SAML20 challenge from server to client.
    * @GSASL_SAML20_AUTHENTICATE_IN_BROWSER: Request to perform SAML20.
-   * @GSASL_OPENID20_AUTH_IDENTIFIER: OPENID20 user authentication identifier.
    * @GSASL_OPENID20_AUTHENTICATE_IN_BROWSER: Request to perform OPENID20.
    * @GSASL_VALIDATE_SIMPLE: Request for simple validation.
    * @GSASL_VALIDATE_EXTERNAL: Request for validation of EXTERNAL.
@@ -347,7 +343,6 @@ extern "C"
     GSASL_CB_TLS_UNIQUE = 18,
     GSASL_SAML20_IDP_IDENTIFIER = 19,
     GSASL_SAML20_REDIRECT_URL = 20,
-    GSASL_OPENID20_AUTH_IDENTIFIER = 21,
     GSASL_OPENID20_REDIRECT_URL = 22,
     GSASL_OPENID20_OUTCOME_DATA = 23,
     /* Client callbacks. */
diff --git a/lib/src/internal.h b/lib/src/internal.h
index 617ab7f..233ecb5 100644
--- a/lib/src/internal.h
+++ b/lib/src/internal.h
@@ -104,7 +104,6 @@ struct Gsasl_session
   char *cb_tls_unique;
   char *saml20_idp_identifier;
   char *saml20_redirect_url;
-  char *openid20_auth_identifier;
   char *openid20_redirect_url;
   char *openid20_outcome_data;
   /* If you add anything here, remember to change change
diff --git a/lib/src/property.c b/lib/src/property.c
index 169ff69..db6a9b0 100644
--- a/lib/src/property.c
+++ b/lib/src/property.c
@@ -112,10 +112,6 @@ map (Gsasl_session * sctx, Gsasl_property prop)
       p = &sctx->saml20_redirect_url;
       break;
 
-    case GSASL_OPENID20_AUTH_IDENTIFIER:
-      p = &sctx->openid20_auth_identifier;
-      break;
-
     case GSASL_OPENID20_REDIRECT_URL:
       p = &sctx->openid20_redirect_url;
       break;
diff --git a/lib/src/xfinish.c b/lib/src/xfinish.c
index 3ba3a30..cfddd82 100644
--- a/lib/src/xfinish.c
+++ b/lib/src/xfinish.c
@@ -66,7 +66,6 @@ gsasl_finish (Gsasl_session * sctx)
   free (sctx->cb_tls_unique);
   free (sctx->saml20_idp_identifier);
   free (sctx->saml20_redirect_url);
-  free (sctx->openid20_auth_identifier);
   free (sctx->openid20_redirect_url);
   free (sctx->openid20_outcome_data);
   /* If you add anything here, remember to change change
diff --git a/src/callbacks.c b/src/callbacks.c
index 5ed5cf6..4963517 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -205,17 +205,6 @@ callback (Gsasl * ctx, Gsasl_session * sctx, 
Gsasl_property prop)
     case GSASL_SCRAM_SALT:
       break;
 
-    case GSASL_OPENID20_AUTH_IDENTIFIER:
-      {
-       char *str = readutf8line ("Enter OpenID authentication identifier "
-                                 "(e.g. \"http://example.org/\";): ");
-
-       gsasl_property_set (sctx, GSASL_OPENID20_AUTH_IDENTIFIER, str);
-
-       rc = GSASL_OK;
-      }
-      break;
-
     case GSASL_SAML20_IDP_IDENTIFIER:
       {
        char *str = readutf8line ("Enter SAML authentication identifier "


hooks/post-receive
-- 
GNU gsasl



reply via email to

[Prev in Thread] Current Thread [Next in Thread]