Move password functions to own file.
Roger A. Light
5 years ago
parent
be8b94189c
commit
f85e004415
@ -0,0 +1,27 @@
|
||||
DIRS= \
|
||||
mosquitto_passwd
|
||||
|
||||
.PHONY : all binary check clean reallyclean test install uninstall
|
||||
|
||||
all :
|
||||
set -e; for d in ${DIRS}; do $(MAKE) -C $${d}; done
|
||||
|
||||
binary :
|
||||
set -e; for d in ${DIRS}; do $(MAKE) -C $${d} $@; done
|
||||
|
||||
clean :
|
||||
set -e; for d in ${DIRS}; do $(MAKE) -C $${d} $@; done
|
||||
|
||||
reallyclean :
|
||||
set -e; for d in ${DIRS}; do $(MAKE) -C $${d} $@; done
|
||||
|
||||
check : test
|
||||
|
||||
test : mosquitto
|
||||
set -e; for d in ${DIRS}; do $(MAKE) -C $${d} $@; done
|
||||
|
||||
install :
|
||||
set -e; for d in ${DIRS}; do $(MAKE) -C $${d} $@; done
|
||||
|
||||
uninstall :
|
||||
set -e; for d in ${DIRS}; do $(MAKE) -C $${d} $@; done
|
||||
@ -0,0 +1,36 @@
|
||||
include ../../config.mk
|
||||
|
||||
.PHONY: all install uninstall clean reallyclean
|
||||
|
||||
OBJS= mosquitto_passwd.o \
|
||||
memory_mosq.o \
|
||||
misc_mosq.o \
|
||||
password_mosq.o
|
||||
|
||||
mosquitto_passwd : ${OBJS}
|
||||
${CROSS_COMPILE}${CC} ${APP_LDFLAGS} $^ -o $@ $(PASSWD_LDADD)
|
||||
|
||||
mosquitto_passwd.o : mosquitto_passwd.c
|
||||
${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@
|
||||
|
||||
memory_mosq.o : ../../lib/memory_mosq.c
|
||||
${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@
|
||||
|
||||
misc_mosq.o : ../../lib/misc_mosq.c ../../lib/misc_mosq.h
|
||||
${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@
|
||||
|
||||
password_mosq.o : ../../src/password_mosq.c ../../src/password_mosq.h
|
||||
${CROSS_COMPILE}${CC} $(APP_CPPFLAGS) $(APP_CFLAGS) -c $< -o $@
|
||||
|
||||
install : all
|
||||
$(INSTALL) -d "${DESTDIR}$(prefix)/bin"
|
||||
$(INSTALL) ${STRIP_OPTS} mosquitto_passwd "${DESTDIR}${prefix}/bin/mosquitto_passwd"
|
||||
|
||||
uninstall :
|
||||
-rm -f "${DESTDIR}${prefix}/bin/mosquitto_passwd"
|
||||
|
||||
clean :
|
||||
-rm -f *.o mosquitto_passwd *.gcda *.gcno
|
||||
|
||||
reallyclean : clean
|
||||
-rm -rf *.orig *.db
|
||||
@ -0,0 +1,195 @@
|
||||
/*
|
||||
Copyright (c) 2012-2020 Roger Light <roger@atchoo.org>
|
||||
|
||||
All rights reserved. This program and the accompanying materials
|
||||
are made available under the terms of the Eclipse Public License v1.0
|
||||
and Eclipse Distribution License v1.0 which accompany this distribution.
|
||||
|
||||
The Eclipse Public License is available at
|
||||
http://www.eclipse.org/legal/epl-v10.html
|
||||
and the Eclipse Distribution License is available at
|
||||
http://www.eclipse.org/org/documents/edl-v10.php.
|
||||
|
||||
Contributors:
|
||||
Roger Light - initial implementation and documentation.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <errno.h>
|
||||
#include <openssl/opensslv.h>
|
||||
#include <openssl/evp.h>
|
||||
#include <openssl/rand.h>
|
||||
#include <openssl/buffer.h>
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "mosquitto.h"
|
||||
#include "memory_mosq.h"
|
||||
#include "password_mosq.h"
|
||||
|
||||
#ifdef WIN32
|
||||
# include <windows.h>
|
||||
# include <process.h>
|
||||
# ifndef __cplusplus
|
||||
# if defined(_MSC_VER) && _MSC_VER < 1900
|
||||
# define bool char
|
||||
# define true 1
|
||||
# define false 0
|
||||
# else
|
||||
# include <stdbool.h>
|
||||
# endif
|
||||
# endif
|
||||
# define snprintf sprintf_s
|
||||
# include <io.h>
|
||||
# include <windows.h>
|
||||
#else
|
||||
# include <stdbool.h>
|
||||
# include <unistd.h>
|
||||
# include <termios.h>
|
||||
# include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#define MAX_BUFFER_LEN 65536
|
||||
#define SALT_LEN 12
|
||||
|
||||
#include "misc_mosq.h"
|
||||
|
||||
int base64_encode(unsigned char *in, unsigned int in_len, char **encoded)
|
||||
{
|
||||
BIO *bmem, *b64;
|
||||
BUF_MEM *bptr;
|
||||
|
||||
b64 = BIO_new(BIO_f_base64());
|
||||
BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
|
||||
bmem = BIO_new(BIO_s_mem());
|
||||
b64 = BIO_push(b64, bmem);
|
||||
BIO_write(b64, in, in_len);
|
||||
if(BIO_flush(b64) != 1){
|
||||
BIO_free_all(b64);
|
||||
return 1;
|
||||
}
|
||||
BIO_get_mem_ptr(b64, &bptr);
|
||||
*encoded = malloc(bptr->length+1);
|
||||
if(!(*encoded)){
|
||||
BIO_free_all(b64);
|
||||
return 1;
|
||||
}
|
||||
memcpy(*encoded, bptr->data, bptr->length);
|
||||
(*encoded)[bptr->length] = '\0';
|
||||
BIO_free_all(b64);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int base64__decode(char *in, unsigned char **decoded, unsigned int *decoded_len)
|
||||
{
|
||||
BIO *bmem, *b64;
|
||||
int slen;
|
||||
|
||||
slen = strlen(in);
|
||||
|
||||
b64 = BIO_new(BIO_f_base64());
|
||||
if(!b64){
|
||||
return 1;
|
||||
}
|
||||
BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
|
||||
|
||||
bmem = BIO_new(BIO_s_mem());
|
||||
if(!bmem){
|
||||
BIO_free_all(b64);
|
||||
return 1;
|
||||
}
|
||||
b64 = BIO_push(b64, bmem);
|
||||
BIO_write(bmem, in, slen);
|
||||
|
||||
if(BIO_flush(bmem) != 1){
|
||||
BIO_free_all(b64);
|
||||
return 1;
|
||||
}
|
||||
*decoded = mosquitto__calloc(slen, 1);
|
||||
if(!(*decoded)){
|
||||
BIO_free_all(b64);
|
||||
return 1;
|
||||
}
|
||||
*decoded_len = BIO_read(b64, *decoded, slen);
|
||||
BIO_free_all(b64);
|
||||
|
||||
if(*decoded_len <= 0){
|
||||
mosquitto__free(*decoded);
|
||||
*decoded = NULL;
|
||||
*decoded_len = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
int pw__hash(const char *password, struct mosquitto_pw *pw, bool new_salt)
|
||||
{
|
||||
int rc;
|
||||
unsigned int hash_len;
|
||||
const EVP_MD *digest;
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
EVP_MD_CTX context;
|
||||
#else
|
||||
EVP_MD_CTX *context;
|
||||
#endif
|
||||
|
||||
if(new_salt){
|
||||
rc = RAND_bytes(pw->salt, sizeof(pw->salt));
|
||||
if(!rc){
|
||||
return MOSQ_ERR_UNKNOWN;
|
||||
}
|
||||
}
|
||||
|
||||
digest = EVP_get_digestbyname("sha512");
|
||||
if(!digest){
|
||||
return MOSQ_ERR_UNKNOWN;
|
||||
}
|
||||
|
||||
if(pw->hashtype == pw_sha512){
|
||||
#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
EVP_MD_CTX_init(&context);
|
||||
EVP_DigestInit_ex(&context, digest, NULL);
|
||||
EVP_DigestUpdate(&context, password, strlen(password));
|
||||
EVP_DigestUpdate(&context, pw->salt, sizeof(pw->salt));
|
||||
EVP_DigestFinal_ex(&context, pw->password_hash, &hash_len);
|
||||
EVP_MD_CTX_cleanup(&context);
|
||||
#else
|
||||
context = EVP_MD_CTX_new();
|
||||
EVP_DigestInit_ex(context, digest, NULL);
|
||||
EVP_DigestUpdate(context, password, strlen(password));
|
||||
EVP_DigestUpdate(context, pw->salt, sizeof(pw->salt));
|
||||
EVP_DigestFinal_ex(context, pw->password_hash, &hash_len);
|
||||
EVP_MD_CTX_free(context);
|
||||
#endif
|
||||
}else{
|
||||
hash_len = sizeof(pw->password_hash);
|
||||
PKCS5_PBKDF2_HMAC(password, strlen(password),
|
||||
pw->salt, sizeof(pw->salt), 20000,
|
||||
digest, hash_len, pw->password_hash);
|
||||
}
|
||||
|
||||
return MOSQ_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
int pw__memcmp_const(const void *a, const void *b, size_t len)
|
||||
{
|
||||
size_t i;
|
||||
int rc = 0;
|
||||
|
||||
if(!a || !b) return 1;
|
||||
|
||||
for(i=0; i<len; i++){
|
||||
if( ((char *)a)[i] != ((char *)b)[i] ){
|
||||
rc = 1;
|
||||
}
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
@ -0,0 +1,39 @@
|
||||
#ifndef PASSWORD_COMMON_H
|
||||
#define PASSWORD_COMMON_H
|
||||
/*
|
||||
Copyright (c) 2012-2020 Roger Light <roger@atchoo.org>
|
||||
|
||||
All rights reserved. This program and the accompanying materials
|
||||
are made available under the terms of the Eclipse Public License v1.0
|
||||
and Eclipse Distribution License v1.0 which accompany this distribution.
|
||||
|
||||
The Eclipse Public License is available at
|
||||
http://www.eclipse.org/legal/epl-v10.html
|
||||
and the Eclipse Distribution License is available at
|
||||
http://www.eclipse.org/org/documents/edl-v10.php.
|
||||
|
||||
Contributors:
|
||||
Roger Light - initial implementation and documentation.
|
||||
*/
|
||||
|
||||
#include <stdbool.h>
|
||||
|
||||
enum mosquitto_pwhash_type{
|
||||
pw_sha512 = 6,
|
||||
pw_sha512_pbkdf2 = 7,
|
||||
};
|
||||
|
||||
#define SALT_LEN 12
|
||||
|
||||
struct mosquitto_pw{
|
||||
unsigned char password_hash[64]; /* For SHA512 */
|
||||
unsigned char salt[SALT_LEN];
|
||||
enum mosquitto_pwhash_type hashtype;
|
||||
};
|
||||
|
||||
int pw__hash(const char *password, struct mosquitto_pw *pw, bool new_salt);
|
||||
int pw__memcmp_const(const void *ptr1, const void *b, size_t len);
|
||||
int base64_encode(unsigned char *in, unsigned int in_len, char **encoded);
|
||||
int base64__decode(char *in, unsigned char **decoded, unsigned int *decoded_len);
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue