remove csd arg to cardops response() method

diff --git a/src/modules/rlm_otp/cardops/cryptocard.c b/src/modules/rlm_otp/cardops/cryptocard.c
index 0fde35c..0c93cc1 100644 (file)
--- a/src/modules/rlm_otp/cardops/cryptocard.c
+++ b/src/modules/rlm_otp/cardops/cryptocard.c
@@ -184,10 +184,6 @@ __attribute__ ((unused))
  */
 static int
 cryptocard_response(otp_user_info_t *user_info,
-#ifdef __GNUC__
-__attribute__ ((unused))
-#endif
-                    const char csd[OTP_MAX_CSD_LEN + 1],
                     const char challenge[OTP_MAX_CHALLENGE_LEN + 1],
                     char response[OTP_MAX_RESPONSE_LEN + 1],
                     const char *log_prefix)

diff --git a/src/modules/rlm_otp/cardops/cryptocard.h b/src/modules/rlm_otp/cardops/cryptocard.h
index 2edfd49..0bf6561 100644 (file)
--- a/src/modules/rlm_otp/cardops/cryptocard.h
+++ b/src/modules/rlm_otp/cardops/cryptocard.h
@@ -49,7 +49,6 @@ static int cryptocard_challenge(const otp_user_info_t *,
                                 char [OTP_MAX_CHALLENGE_LEN + 1], time_t,
                                 int, int, const char *);
 static int cryptocard_response(otp_user_info_t *,
-                               const char [OTP_MAX_CSD_LEN + 1],
                                const char [OTP_MAX_CHALLENGE_LEN + 1],
                                char [OTP_MAX_RESPONSE_LEN + 1],
                                const char *);

diff --git a/src/modules/rlm_otp/otp_cardops.c b/src/modules/rlm_otp/otp_cardops.c
index 2f634d0..a92a6b0 100644 (file)
--- a/src/modules/rlm_otp/otp_cardops.c
+++ b/src/modules/rlm_otp/otp_cardops.c
@@ -242,7 +242,7 @@ async_response:
     }
 
     /* Calculate the async response. */
-    if (user_info.cardops->response(&user_info, user_state.csd, challenge,
+    if (user_info.cardops->response(&user_info, challenge,
                                     &e_response[pin_offset],
                                     log_prefix) != 0) {
       otp_log(OTP_LOG_ERR, "%s: unable to calculate async response for [%s], "
@@ -390,7 +390,7 @@ sync_response:
         }
 
         /* Calculate sync response. */
-        if (user_info.cardops->response(&user_info, user_state.csd, challenge,
+        if (user_info.cardops->response(&user_info, challenge,
                                         &e_response[pin_offset],
                                         log_prefix) != 0) {
           otp_log(OTP_LOG_ERR,

diff --git a/src/modules/rlm_otp/otp_cardops.h b/src/modules/rlm_otp/otp_cardops.h
index cae59ef..4d5564c 100644 (file)
--- a/src/modules/rlm_otp/otp_cardops.h
+++ b/src/modules/rlm_otp/otp_cardops.h
@@ -74,8 +74,7 @@ typedef struct cardops_t {
   int (*challenge)(const otp_user_info_t *, const otp_user_state_t *,
                    char [OTP_MAX_CHALLENGE_LEN + 1], time_t, int, int,
                    const char *);
-  int (*response)(otp_user_info_t *, const char [OTP_MAX_CSD_LEN + 1],
-                  const char [OTP_MAX_CHALLENGE_LEN + 1],
+  int (*response)(otp_user_info_t *, const char [OTP_MAX_CHALLENGE_LEN + 1],
                   char [OTP_MAX_RESPONSE_LEN + 1], const char *);
   int (*updatecsd)(const otp_user_info_t *, otp_user_state_t *,
                    const char [OTP_MAX_CHALLENGE_LEN + 1],