kopia lustrzana https://github.com/Hamlib/Hamlib
Change make_md5 to rig_make_md5 and export for the DLL build
https://github.com/Hamlib/Hamlib/issues/813pull/1022/head
rodzic
b085b353e5
commit
5c6e92a089
|
@ -291,7 +291,7 @@ unsigned char *make_hash(char *arg)
|
||||||
return digest;
|
return digest;
|
||||||
}
|
}
|
||||||
|
|
||||||
char *make_md5(char *pass)
|
char *rig_make_md5(char *pass)
|
||||||
{
|
{
|
||||||
unsigned char *hash = make_hash("password");
|
unsigned char *hash = make_hash("password");
|
||||||
char *md5str = make_digest(hash, 16);
|
char *md5str = make_digest(hash, 16);
|
||||||
|
|
|
@ -27,8 +27,9 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include "hamlib/rig.h"
|
||||||
|
|
||||||
char *make_md5(char *pass);
|
extern HAMLIB_EXPORT(char*) rig_make_md5(char *pass);
|
||||||
|
|
||||||
typedef unsigned long MD5_u32plus;
|
typedef unsigned long MD5_u32plus;
|
||||||
|
|
|
@ -26,11 +26,10 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "hamlib/rig.h"
|
#include "hamlib/rig.h"
|
||||||
#include "password.h"
|
#include "password.h"
|
||||||
|
#include "md5.h"
|
||||||
|
|
||||||
#define HAMLIB_SECRET_LENGTH 32
|
#define HAMLIB_SECRET_LENGTH 32
|
||||||
|
|
||||||
extern char *make_md5(char *password);
|
|
||||||
|
|
||||||
// makes a 32-byte secret key from password using MD5
|
// makes a 32-byte secret key from password using MD5
|
||||||
// yes -- this is security-by-obscurity
|
// yes -- this is security-by-obscurity
|
||||||
// but password hacking software doesn't use this type of logic
|
// but password hacking software doesn't use this type of logic
|
||||||
|
@ -52,7 +51,7 @@ HAMLIB_EXPORT(void) rig_password_generate_secret(char *pass,
|
||||||
|
|
||||||
snprintf(newpass, sizeof(newpass) - 1, "%s\t%lu\n", pass, (long)rand());
|
snprintf(newpass, sizeof(newpass) - 1, "%s\t%lu\n", pass, (long)rand());
|
||||||
printf("debug=%s\n", newpass);
|
printf("debug=%s\n", newpass);
|
||||||
char *md5str = make_md5(newpass);
|
char *md5str = rig_make_md5(newpass);
|
||||||
|
|
||||||
strncpy(result, md5str, HAMLIB_SECRET_LENGTH);
|
strncpy(result, md5str, HAMLIB_SECRET_LENGTH);
|
||||||
|
|
||||||
|
|
|
@ -38,18 +38,18 @@ if HAVE_LIBUSB
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# include generated include files ahead of any in sources
|
# include generated include files ahead of any in sources
|
||||||
rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) -I$(srcdir)/security $(AM_CPPFLAGS)
|
rigctl_CPPFLAGS = -I$(top_builddir)/tests -I$(top_builddir)/src -I$(srcdir) -I$(top_builddir)/security $(AM_CPPFLAGS)
|
||||||
|
|
||||||
# all the programs need this
|
# all the programs need this
|
||||||
LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la $(DL_LIBS)
|
LDADD = $(top_builddir)/src/libhamlib.la $(top_builddir)/lib/libmisc.la $(DL_LIBS)
|
||||||
|
|
||||||
rigmem_CFLAGS = $(AM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_builddir)/src
|
rigmem_CFLAGS = $(AM_CFLAGS) $(LIBXML2_CFLAGS) -I$(top_builddir)/src
|
||||||
rigctld_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src -I$(srcdir)/security
|
rigctld_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src -I$(top_builddir)/security
|
||||||
rotctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
|
rotctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
|
||||||
rotctld_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
|
rotctld_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
|
||||||
ampctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
|
ampctl_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
|
||||||
ampctld_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
|
ampctld_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/src
|
||||||
rigctlcom_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS)
|
rigctlcom_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) -I$(top_builddir)/security
|
||||||
if HAVE_LIBUSB
|
if HAVE_LIBUSB
|
||||||
rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
|
rigtestlibusb_CFLAGS = $(AM_CFLAGS) $(PTHREAD_CFLAGS) $(LIBUSB_CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -4946,7 +4946,7 @@ int rigctld_password_check(RIG *rig, const char *md5)
|
||||||
rig_debug(RIG_DEBUG_TRACE, "%s: %s == %s\n", __func__, md5, rigctld_password);
|
rig_debug(RIG_DEBUG_TRACE, "%s: %s == %s\n", __func__, md5, rigctld_password);
|
||||||
is_passwordOK = 0;
|
is_passwordOK = 0;
|
||||||
|
|
||||||
char *mymd5 = make_md5(rigctld_password);
|
char *mymd5 = rig_make_md5(rigctld_password);
|
||||||
|
|
||||||
if (strcmp(md5, mymd5) == 0)
|
if (strcmp(md5, mymd5) == 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,6 +75,7 @@
|
||||||
#include "serial.h"
|
#include "serial.h"
|
||||||
#include "sprintflst.h"
|
#include "sprintflst.h"
|
||||||
#include "network.h"
|
#include "network.h"
|
||||||
|
#include "md5.h"
|
||||||
|
|
||||||
#include "rigctl_parse.h"
|
#include "rigctl_parse.h"
|
||||||
|
|
||||||
|
@ -238,8 +239,6 @@ static void handle_error(enum rig_debug_level_e lvl, const char *msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
extern char *make_md5(char *password);
|
|
||||||
|
|
||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
rig_model_t my_model = RIG_MODEL_DUMMY;
|
rig_model_t my_model = RIG_MODEL_DUMMY;
|
||||||
|
@ -308,7 +307,7 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
case 'A':
|
case 'A':
|
||||||
strncpy(rigctld_password, optarg, sizeof(rigctld_password) - 1);
|
strncpy(rigctld_password, optarg, sizeof(rigctld_password) - 1);
|
||||||
char *md5 = make_md5(rigctld_password);
|
char *md5 = rig_make_md5(rigctld_password);
|
||||||
printf("Secret key: %s\n", md5);
|
printf("Secret key: %s\n", md5);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Ładowanie…
Reference in New Issue