backport from HEAD

[freeradius.git] / src / modules / rlm_otp / otp_rad.h

diff --git a/src/modules/rlm_otp/otp_rad.h b/src/modules/rlm_otp/otp_rad.h
index 45208c6..a379ea6 100644 (file)
--- a/src/modules/rlm_otp/otp_rad.h
+++ b/src/modules/rlm_otp/otp_rad.h
@@ -17,37 +17,35 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Copyright 2001,2002  Google, Inc.
- * Copyright 2005 Frank Cusack
+ * Copyright 2005 TRI-D Systems, Inc.
  */
 
 #ifndef OTP_RAD_H
 #define OTP_RAD_H
 
-#include "autoconf.h"
-#include "radiusd.h"
+#include <autoconf.h>
+#include <radiusd.h>
 #define OTP_LOG_DEBUG L_DBG
 #define OTP_LOG_ERR   L_ERR
 #define OTP_LOG_AUTH  L_AUTH
 #define OTP_LOG_INFO  L_INFO
 #define OTP_LOG_CRIT  (L_ERR|L_CONS)
 
-/* otp_state.c */
-extern int otp_gen_state(char **ascii_state, unsigned char **raw_state,
-                        const char challenge[OTP_MAX_CHALLENGE_LEN + 1],
-                        int32_t flags, int32_t when,
-                        const unsigned char key[16]);
+/* otp_radstate.c */
+extern int otp_gen_state(char **, unsigned char **,
+                         const unsigned char [OTP_MAX_CHALLENGE_LEN], size_t,
+                         int32_t, int32_t, const unsigned char [16]);
 
 /* otp_pwe.c */
-#include "libradius.h"   /* VALUE_PAIR */
+#include <libradius.h>   /* VALUE_PAIR */
 struct otp_pwe_cmp_t {
-    const REQUEST *request;
-    const otp_option_t *inst;
-    int pwattr;                /* return value from otp_pwe_present() */
-    VALUE_PAIR **returned_vps;
+  const REQUEST                *request;
+  const otp_option_t   *inst;
+  int                  pwattr; /* return value from otp_pwe_present() */
+  VALUE_PAIR           **returned_vps;
 };
 extern void otp_pwe_init(void);
-extern int otp_pwe_present(const REQUEST *request);
-extern int otp_pwe_cmp(struct otp_pwe_cmp_t *data, const char *password);
+extern int otp_pwe_present(const REQUEST *, const char *);
+extern int otp_pwe_cmp(struct otp_pwe_cmp_t *, const char *, const char *);
 
 #endif /* OTP_RAD_H */
-