reintegrated two-sim branch providing SIM card plugin API

[strongswan.git] / src / charon / plugins / eap_sim / eap_sim.h

diff --git a/src/charon/plugins/eap_sim/eap_sim.h b/src/charon/plugins/eap_sim/eap_sim.h
index 65020aa..ec061b6 100644 (file)
--- a/src/charon/plugins/eap_sim/eap_sim.h
+++ b/src/charon/plugins/eap_sim/eap_sim.h
@@ -25,62 +25,12 @@ typedef struct eap_sim_t eap_sim_t;
 
 #include <sa/authenticators/eap/eap_method.h>
 
 
 #include <sa/authenticators/eap/eap_method.h>
 

-/** the library containing with the triplet functions */
-#ifndef SIM_READER_LIB
-#error SIM_READER_LIB not specified, use --with-sim-reader option
-#endif /* SIM_READER_LIB */
-
-/** 
- * Cardreaders SIM function.
- *
- * @param rand                 RAND to run algo with
- * @param rand_length  length of value in rand
- * @param sres                 buffer to get SRES
- * @param sres_length  size of buffer in sres, returns bytes written to SRES
- * @param kc                   buffer to get Kc
- * @param kc_length            size of buffer in Kc, returns bytes written to Kc
- * @return                             zero on success
- */
-typedef int (*sim_algo_t)(const unsigned char *rand, int rand_length,
-                                                 unsigned char *sres, int *sres_length, 
-                                                 unsigned char *kc, int *kc_length);
-
-#ifndef SIM_READER_ALG
-/** the SIM_READER_LIB's algorithm, uses sim_algo_t signature */
-#define SIM_READER_ALG "sim_run_alg"
-#endif /* SIM_READER_ALG */
-
-/** 
- * Function to get a SIM triplet.
- *
- * @param identity             identity (imsi) to get a triplet for                    
- * @param rand                 buffer to get RAND
- * @param rand_length  size of buffer in rand, returns bytes written to RAND
- * @param sres                 buffer to get SRES
- * @param sres_length  size of buffer in sres, returns bytes written to SRES
- * @param kc                   buffer to get Kc
- * @param kc_length            size of buffer in Kc, returns bytes written to Kc
- * @return                             zero on success
- */
-typedef int (*sim_get_triplet_t)(char *identity,
-                                                                unsigned char *rand, int *rand_length,
-                                                                unsigned char *sres, int *sres_length, 
-                                                                unsigned char *kc, int *kc_length);
-                                                 
-#ifndef SIM_READER_GET_TRIPLET
-/** the SIM_READER_LIB's get-triplet function, uses sim_get_triplet_t signature */
-#define SIM_READER_GET_TRIPLET "sim_get_triplet"
-#endif /* SIM_READER_GET_TRIPLET */
-

 /**
  * Implementation of the eap_method_t interface using EAP-SIM.
  *
 /**
  * Implementation of the eap_method_t interface using EAP-SIM.
  *

- * This EAP-SIM client implementation uses another pluggable library to
- * access the SIM card/triplet provider. This module is specified using the
- * SIM_READER_LIB definition. It has to privde a sim_run_alg() function to
- * calculate a triplet (client), and/or a sim_get_triplet() function to get
- * a triplet (server). These functions are named to the SIM_READER_ALG and
- * the SIM_READER_GET_TRIPLET definitions.
+ * This EAP-SIM client implementation handles the protocol level of EAP-SIM
+ * only, it does not provide triplet calculation/fetching. Other plugins may
+ * provide these services using the sim_manager_t of charon.

  */
 struct eap_sim_t {
 
  */
 struct eap_sim_t {