Commit d10912e

committed

Working on password access for rigctld -- not fully implmented yet

Need to check on security audit and cross-platform compilation first

1 parent d04f4b6 commit d10912eCopy full SHA for d10912e

File tree

+2624

-26

lines changed

+2624

-26

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ EXTRA_DIST = PLAN LICENSE hamlib.m4 hamlib.pc.in README.developer \`
`13`	`13`	`doc_DATA = ChangeLog COPYING COPYING.LIB LICENSE \`
`14`	`14`	`README README.betatester README.developer`
`15`	`15`
`16`		`-SUBDIRS = macros include lib \`
	`16`	`+SUBDIRS = macros include lib security \`
`17`	`17`	`$(BACKEND_LIST) \`
`18`	`18`	`$(RIG_BACKEND_LIST) \`
`19`	`19`	`$(ROT_BACKEND_LIST) \`
`@@ -24,7 +24,7 @@ SUBDIRS = macros include lib \`
`24`	`24`
`25`	`25`	`## Static list of distributed directories.`
`26`	`26`	`DIST_SUBDIRS = macros include lib src c++ bindings tests doc android scripts rotators/indi simulators\`
`27`		`- $(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST)`
	`27`	`+ security $(BACKEND_LIST) $(RIG_BACKEND_LIST) $(ROT_BACKEND_LIST) $(AMP_BACKEND_LIST)`
`28`	`28`
`29`	`29`	`# Install any third party macros into our tree for distribution`
`30`	`30`	`ACLOCAL_AMFLAGS = -I macros --install`

Lines changed: 1 addition & 0 deletions

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2041,6 +2041,7 @@ struct rig_caps {`
`2041`	`2041`	`// this will be used to check rigcaps structure is compatible with client`
`2042`	`2042`	`char *hamlib_check_rig_caps; // a constant value we can check for hamlib integrity`
`2043`	`2043`	`int (get_conf2)(RIG rig, token_t token, char *val, int val_len);`
	`2044`	`+ int (password)(RIG rig, unsigned char key1, unsigned char key2); /< Send encrypted password if rigctld is secured with -A/--password /`
`2044`	`2045`	`};`
`2045`	`2046`	`//! @endcond`
`2046`	`2047`
`@@ -3378,6 +3379,8 @@ extern HAMLIB_EXPORT(int) hl_usleep(rig_useconds_t msec);`
`3378`	`3379`
`3379`	`3380`	`extern HAMLIB_EXPORT(int) rig_cookie(RIG rig, enum cookie_e cookie_cmd, char cookie, int cookie_len);`
`3380`	`3381`
	`3382`	`+extern HAMLIB_EXPORT(int) rig_password(RIG rig, const unsigned char key1, const unsigned char *key2);`
	`3383`	`+`
`3381`	`3384`	`//extern HAMLIB_EXPORT(int)`
`3382`	`3385`	`int longlat2locator HAMLIB_PARAMS((double longitude,`
`3383`	`3386`	`double latitude,`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2630,7 +2630,18 @@ static int netrigctl_power2mW(RIG rig, unsigned int mwpower, float power,`
`2630`	`2630`	`RETURNFUNC(RIG_OK);`
`2631`	`2631`	`}`
`2632`	`2632`
	`2633`	`+int netrigctl_password(RIG rig, unsigned char key1, unsigned char *key2)`
	`2634`	`+{`
	`2635`	`+ char cmdbuf[256];`
	`2636`	`+ char buf[256];`
	`2637`	`+ int retval;`
`2633`	`2638`
	`2639`	`+ ENTERFUNC;`
	`2640`	`+ rig_debug(RIG_DEBUG_VERBOSE, "%s: key1=%s, key2=%s\n", __func__, key1, key2);`
	`2641`	`+ SNPRINTF(cmdbuf, sizeof(cmdbuf), "\\password %s\n", key1);`
	`2642`	`+ retval = netrigctl_transaction(rig, cmdbuf, strlen(cmdbuf), buf);`
	`2643`	`+ RETURNFUNC(retval);`
	`2644`	`+}`
`2634`	`2645`
`2635`	`2646`	`/*`
`2636`	`2647`	`* Netrigctl rig capabilities.`
`@@ -2746,6 +2757,7 @@ struct rig_caps netrigctl_caps =`
`2746`	`2757`	`//.get_trn = netrigctl_get_trn,`
`2747`	`2758`	`.power2mW = netrigctl_power2mW,`
`2748`	`2759`	`.mW2power = netrigctl_mW2power,`
	`2760`	`+ .password = netrigctl_password,`
`2749`	`2761`
`2750`	`2762`	`.hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS`
`2751`	`2763`	`};`

Comments

(0)