Rename am_generate_session_id() to am_generate_id().

Since this function is used for both generating session IDs and for
generating POST data identifiers for POST replay, it should have a
generic name.

git-svn-id: https://modmellon.googlecode.com/svn/trunk@181 a716ebb1-153a-0410-b759-cfb97c6a1b53

4 files changed, 19 insertions, 18 deletions

diff --git a/auth_mellon.h b/auth_mellon.h
index 176b2f6..fa3df40 100644
--- a/auth_mellon.h
+++ b/auth_mellon.h
@@ -76,9 +76,10 @@
 #define AM_CACHE_MAX_LASSO_SAML_RESPONSE_SIZE 65536
 
 
-/* This is the length of the session id we use.
+/* This is the length of the id we use (for session IDs and
+ * replaying POST data).
  */
-#define AM_SESSION_ID_LENGTH 32
+#define AM_ID_LENGTH 32
 
 
 #define am_get_srv_cfg(s) (am_srv_cfg_rec *)ap_get_module_config((s)->module_config, &auth_mellon_module)
@@ -336,7 +337,7 @@ char *am_extract_query_parameter(apr_pool_t *pool,
 char *am_urlencode(apr_pool_t *pool, const char *str);
 int am_urldecode(char *data);
 int am_check_url(request_rec *r, const char *url);
-char *am_generate_session_id(request_rec *r);
+char *am_generate_id(request_rec *r);
 char *am_getfile(apr_pool_t *conf, server_rec *s, const char *file);
 char *am_get_endpoint_url(request_rec *r);
 int am_postdir_cleanup(request_rec *s);
diff --git a/auth_mellon_cache.c b/auth_mellon_cache.c
index 9c03506..eb7cc88 100644
--- a/auth_mellon_cache.c
+++ b/auth_mellon_cache.c
@@ -51,7 +51,7 @@ am_cache_entry_t *am_cache_lock(server_rec *s,
 
     switch (type) {
     case AM_CACHE_SESSION:
-        if (strlen(key) != AM_SESSION_ID_LENGTH)
+        if (strlen(key) != AM_ID_LENGTH)
             return NULL;
         break;
     case AM_CACHE_NAMEID:
@@ -140,7 +140,7 @@ am_cache_entry_t *am_cache_new(server_rec *s, const char *key)
     char buffer[512];
 
     /* Check if we have a valid session key. We abort if we don't. */
-    if(key == NULL || strlen(key) != AM_SESSION_ID_LENGTH) {
+    if(key == NULL || strlen(key) != AM_ID_LENGTH) {
         return NULL;
     }
 
diff --git a/auth_mellon_session.c b/auth_mellon_session.c
index f91b740..d8d9382 100644
--- a/auth_mellon_session.c
+++ b/auth_mellon_session.c
@@ -73,7 +73,7 @@ am_cache_entry_t *am_new_request_session(request_rec *r)
     const char *session_id;
 
     /* Generate session id. */
-    session_id = am_generate_session_id(r);
+    session_id = am_generate_id(r);
     if(session_id == NULL) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                       "Error creating session id.");
diff --git a/auth_mellon_util.c b/auth_mellon_util.c
index da6a43e..3c0a5d9 100644
--- a/auth_mellon_util.c
+++ b/auth_mellon_util.c
@@ -764,17 +764,17 @@ int am_generate_random_bytes(request_rec *r, void *dest, apr_size_t count)
 }
 
 
-/* This function generates a session id which is AM_SESSION_ID_LENGTH
- * characters long. The session id will consist of hexadecimal characters.
+/* This function generates an id which is AM_ID_LENGTH characters long.
+ * The id will consist of hexadecimal characters.
  *
  * Parameters:
- *  request_rec *r       The request we generate a session id for.
+ *  request_rec *r       The request we associate allocated memory with.
  *
  * Returns:
- *  The session id, made up of AM_SESSION_ID_LENGTH hexadecimal characters,
+ *  The session id, made up of AM_ID_LENGTH hexadecimal characters,
  *  terminated by a null-byte.
  */
-char *am_generate_session_id(request_rec *r)
+char *am_generate_id(request_rec *r)
 {
     int rc;
     char *ret;
@@ -784,18 +784,18 @@ char *am_generate_session_id(request_rec *r)
     unsigned char b;
     int hi, low;
 
-    ret = (char *)apr_palloc(r->pool, AM_SESSION_ID_LENGTH + 1);
+    ret = (char *)apr_palloc(r->pool, AM_ID_LENGTH + 1);
 
     /* We need to round the length of the random data _up_, in case the
      * length of the session id isn't even.
      */
-    rand_data_len = (AM_SESSION_ID_LENGTH + 1) / 2;
+    rand_data_len = (AM_ID_LENGTH + 1) / 2;
 
     /* Fill the last rand_data_len bytes of the string with
      * random bytes. This allows us to overwrite from the beginning of
      * the string.
      */
-    rand_data = (unsigned char *)&ret[AM_SESSION_ID_LENGTH - rand_data_len];
+    rand_data = (unsigned char *)&ret[AM_ID_LENGTH - rand_data_len];
 
     /* Generate random numbers. */
     rc = am_generate_random_bytes(r, rand_data, rand_data_len);
@@ -804,11 +804,11 @@ char *am_generate_session_id(request_rec *r)
     }
 
     /* Convert the random bytes to hexadecimal. Note that we will write
-     * AM_SESSION_LENGTH+1 characters if we have a non-even length of the
+     * AM_ID_LENGTH+1 characters if we have a non-even length of the
      * session id. This is OK - we will simply overwrite the last character
      * with the null-terminator afterwards.
      */
-    for(i = 0; i < AM_SESSION_ID_LENGTH; i += 2) {
+    for(i = 0; i < AM_ID_LENGTH; i += 2) {
         b = rand_data[i / 2];
         hi = (b >> 4) & 0xf;
         low = b & 0xf;
@@ -827,7 +827,7 @@ char *am_generate_session_id(request_rec *r)
     }
 
     /* Add null-terminator- */
-    ret[AM_SESSION_ID_LENGTH] = '\0';
+    ret[AM_ID_LENGTH] = '\0';
 
     return ret;
 }
@@ -1098,7 +1098,7 @@ int am_save_post(request_rec *r, const char **relay_state)
 
     mod_cfg = am_get_mod_cfg(r->server);
 
-    if ((psf_id = am_generate_session_id(r)) == NULL) {
+    if ((psf_id = am_generate_id(r)) == NULL) {
         ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "cannot generate id");
         return HTTP_INTERNAL_SERVER_ERROR;
     }