change signature of import fuction, cfg first

diff --git a/ykpers-json.c b/ykpers-json.c
index f4985cc555cae70ecb6879d9d3b447da21f98130..dfca414cabd79a0ce7d833e549047a283a0e2f27 100644 (file)
--- a/ykpers-json.c
+++ b/ykpers-json.c
@@ -164,7 +164,7 @@ int _ykp_json_export_cfg(const YKP_CONFIG *cfg, char *json, size_t len) {
        return strlen(json);
 }
 
-int _ykp_json_import_cfg(const char *json, size_t len, YKP_CONFIG *cfg) {
+int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len) {
        if(cfg) {
                json_object *jobj = json_tokener_parse(json);
                json_object *yprod_json = json_object_object_get(jobj, "yubiProdConfig");

diff --git a/ykpers-json.h b/ykpers-json.h
index 9708b30fefd6bb1f24bb95added50374de26490f..ed0553891214741f94617d433cbda290697e577e 100644 (file)
--- a/ykpers-json.h
+++ b/ykpers-json.h
@@ -38,7 +38,7 @@ extern "C" {
 # endif
 
 int _ykp_json_export_cfg(const YKP_CONFIG *cfg, char *json, size_t len);
-int _ykp_json_import_cfg(const char *json, size_t len, YKP_CONFIG *cfg);
+int _ykp_json_import_cfg(YKP_CONFIG *cfg, const char *json, size_t len);
 
 # ifdef __cplusplus
 }

diff --git a/ykpers.c b/ykpers.c
index 18b36085f03ad40165723acc4adcf4f540f62520..1f83981bd2b2258d87de544ae3f9bd02699bb9fa 100644 (file)
--- a/ykpers.c
+++ b/ykpers.c
@@ -1006,10 +1006,10 @@ int ykp_export_config(const YKP_CONFIG *cfg, char *buf, size_t len,
 }
 
 
-int ykp_import_config(const char *buf, size_t len, YKP_CONFIG *cfg,
+int ykp_import_config(YKP_CONFIG *cfg, const char *buf, size_t len,
                int format) {
        if(format == YKP_FORMAT_YCFG) {
-               return _ykp_json_import_cfg(buf, len, cfg);
+               return _ykp_json_import_cfg(cfg, buf, len);
        } else if(format == YKP_FORMAT_LEGACY) {
                ykp_errno = YKP_ENOTYETIMPL;
        }

diff --git a/ykpers.h b/ykpers.h
index 8369703ecc4ffd0ab5d73bbb695709f2212517eb..3584e6737fd631e2d32433aa6c396e5d4dcd3504 100644 (file)
--- a/ykpers.h
+++ b/ykpers.h
@@ -138,7 +138,7 @@ int ykp_command(YKP_CONFIG *cfg);
 int ykp_config_num(YKP_CONFIG *cfg);
 
 int ykp_export_config(const YKP_CONFIG *cfg, char *buf, size_t len, int format);
-int ykp_import_config(const char *buf, size_t len, YKP_CONFIG *cfg, int format);
+int ykp_import_config(YKP_CONFIG *cfg, const char *buf, size_t len, int format);
 
 #define YKP_FORMAT_LEGACY      0x01
 #define YKP_FORMAT_YCFG                0x02

diff --git a/ykpersonalize.c b/ykpersonalize.c
index b6f864375cc702bac8ce888f739fdaff2a66d5dc..5aaaa061a85d7cdbb55b5858ad2ae5b88ce821d2 100644 (file)
--- a/ykpersonalize.c
+++ b/ykpersonalize.c
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
        if (inf) {
                if(!fread(data, 1, 1024, inf))
                        goto err;
-               if (!ykp_import_config(data, strlen(data), cfg, data_format))
+               if (!ykp_import_config(cfg, data, strlen(data), data_format))
                        goto err;
        } else if (! aesviahash && ! zap && (ykp_command(cfg) == SLOT_CONFIG || ykp_command(cfg) == SLOT_CONFIG2)) {
                char passphrasebuf[256]; size_t passphraselen;