2025-04-29 Fred Gleason <fredg@paravelsystems.com>

* Cleaned up deprecation warnings in 'lib/rdhash.cpp'.
	* Added a 'sha1_test' test harness in 'tests/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>

.gitignore

@@ -164,6 +164,7 @@ tests/rml_torture_test
 tests/sas_switch_torture
 tests/sas_torture
 tests/sendmail_test
+tests/sha1_test
 tests/stringcode_test
 tests/tempdir_test
 tests/test_hash

ChangeLog

@@ -25063,3 +25063,6 @@
 	'RDConfig::provisioningServiceName()' to use the QRegularExpression
 	class rather than QRegExp.
 	* Added a 'provisioning_test' test harness in 'tests/'.
+2025-04-29 Fred Gleason <fredg@paravelsystems.com>
+	* Cleaned up deprecation warnings in 'lib/rdhash.cpp'.
+	* Added a 'sha1_test' test harness in 'tests/'.

lib/rdhash.cpp

@@ -1,8 +1,8 @@
 // rdhash.cpp
 //
-// Functions for generating hashes.
+// Functions for generating and verifying hashes.
 //
-//   (C) Copyright 2017-2021 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2017-2025 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -26,6 +26,7 @@
 #include <stdio.h>
 
 #include <openssl/sha.h>
+#include <openssl/evp.h>
 
 #include <QDateTime>
 
@@ -33,16 +34,23 @@
 
 QString __RDSha1Hash_MakePasswordHash(const QString &secret,const QString &salt)
 {
-  SHA_CTX ctx;
+  QByteArray bytes;
-  unsigned char md[SHA_DIGEST_LENGTH];
+  EVP_MD_CTX *ctx;
+  unsigned char *digest=NULL;
+  unsigned int digest_len=EVP_MD_size(EVP_sha1());
 
-  SHA1_Init(&ctx);
+  ctx=EVP_MD_CTX_new();
-  SHA1_Update(&ctx,salt.toUtf8(),salt.toUtf8().length());
+  EVP_DigestInit_ex(ctx,EVP_sha1(),NULL);
-  SHA1_Update(&ctx,secret.toUtf8(),secret.toUtf8().length());
+  bytes=salt.toUtf8();
-  SHA1_Final(md,&ctx);
+  EVP_DigestUpdate(ctx,bytes,bytes.size());
+  bytes=secret.toUtf8();
+  EVP_DigestUpdate(ctx,bytes,bytes.size());
+  digest=(unsigned char *)OPENSSL_malloc(digest_len);
+  EVP_DigestFinal_ex(ctx,digest,&digest_len);
+  EVP_MD_CTX_free(ctx);
   QString ret=salt;
-  for(int i=0;i<SHA_DIGEST_LENGTH;i++) {
+  for(unsigned i=0;i<digest_len;i++) {
-    ret+=QString::asprintf("%02x",0xff&md[i]);
+    ret+=QString::asprintf("%02x",0xFF&(digest[i]));
   }
   
   return ret;
@@ -51,15 +59,19 @@ QString __RDSha1Hash_MakePasswordHash(const QString &secret,const QString &salt)
 
 QString RDSha1HashData(const QByteArray &data)
 {
-  SHA_CTX ctx;
+  EVP_MD_CTX *ctx;
-  unsigned char md[SHA_DIGEST_LENGTH];
+  unsigned char *digest=NULL;
-  QString ret;
+  unsigned int digest_len=EVP_MD_size(EVP_sha1());
 
-  SHA1_Init(&ctx);
+  ctx=EVP_MD_CTX_new();
-  SHA1_Update(&ctx,data,data.length());
+  EVP_DigestInit_ex(ctx,EVP_sha1(),NULL);
-  SHA1_Final(md,&ctx);
+  EVP_DigestUpdate(ctx,data,data.size());
-  for(int i=0;i<SHA_DIGEST_LENGTH;i++) {
+  digest=(unsigned char *)OPENSSL_malloc(digest_len);
-    ret+=QString::asprintf("%02x",0xff&md[i]);
+  EVP_DigestFinal_ex(ctx,digest,&digest_len);
+  EVP_MD_CTX_free(ctx);
+  QString ret;
+  for(unsigned i=0;i<digest_len;i++) {
+    ret+=QString::asprintf("%02x",0xFF&(digest[i]));
   }
   
   return ret;
@@ -68,31 +80,32 @@ QString RDSha1HashData(const QByteArray &data)
 
 QString RDSha1HashFile(const QString &filename,bool throttle)
 {
-  QString ret;
+  unsigned char buffer[1024];
-  SHA_CTX ctx;
   int fd=-1;
   int n;
-  char data[1024];
+  EVP_MD_CTX *ctx;
-  unsigned char md[SHA_DIGEST_LENGTH];
+  unsigned char *digest=NULL;
+  unsigned int digest_len=EVP_MD_size(EVP_sha1());
 
-  if((fd=open(filename.toUtf8(),O_RDONLY))<0) {
+  if((fd=open(filename.toUtf8(),O_RDONLY))>=0) {
+    ctx=EVP_MD_CTX_new();
+    EVP_DigestInit_ex(ctx,EVP_sha1(),NULL);
+    while((n=read(fd,buffer,1024))>0) {
+      EVP_DigestUpdate(ctx,buffer,n);
+    }
+    if(n<0) {  // read() returned an error!
+      fprintf(stderr,"RDSha1HashFile() read error: %s\n",strerror(errno));
+    }
+    digest=(unsigned char *)OPENSSL_malloc(digest_len);
+    EVP_DigestFinal_ex(ctx,digest,&digest_len);
+    EVP_MD_CTX_free(ctx);
+    QString ret;
+    for(unsigned i=0;i<digest_len;i++) {
+      ret+=QString::asprintf("%02x",0xFF&(digest[i]));
+    }
     return ret;
   }
-  SHA1_Init(&ctx);
+  return QString();
-  while((n=read(fd,data,1024))>0) {
-    SHA1_Update(&ctx,data,n);
-    if(throttle) {
-      usleep(1);
-    }
-  }
-  close(fd);
-  SHA1_Final(md,&ctx);
-  ret="";
-  for(int i=0;i<SHA_DIGEST_LENGTH;i++) {
-    ret+=QString::asprintf("%02x",0xff&md[i]);
-  }
-
-  return ret;
 }
 
 

lib/rdhash.h

@@ -1,8 +1,8 @@
 // rdhash.h
 //
-// Functions for generating hashes.
+// Functions for generating and verifying hashes.
 //
-//   (C) Copyright 2017 Fred Gleason <fredg@paravelsystems.com>
+//   (C) Copyright 2017-2025 Fred Gleason <fredg@paravelsystems.com>
 //
 //   This program is free software; you can redistribute it and/or modify
 //   it under the terms of the GNU General Public License version 2 as
@@ -21,7 +21,7 @@
 #ifndef RDHASH_H
 #define RDHASH_H
 
-#include <qstring.h>
+#include <QString>
 
 QString RDSha1HashData(const QByteArray &data);
 QString RDSha1HashFile(const QString &filename,bool throttle=false);

tests/Makefile.am

@@ -53,6 +53,7 @@ noinst_PROGRAMS = audio_convert_test\
                   reserve_carts_test\
                   rml_torture_test\
                   sendmail_test\
+                  sha1_test\
                   stringcode_test\
                   tempdir_test\
                   test_hash\
@@ -154,6 +155,10 @@ rml_torture_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@
 dist_sendmail_test_SOURCES = sendmail_test.cpp sendmail_test.h
 sendmail_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
 
+dist_sha1_test_SOURCES = sha1_test.cpp sha1_test.h
+nodist_sha1_test_SOURCES = moc_sha1_test.cpp
+sha1_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
+
 dist_stringcode_test_SOURCES = stringcode_test.cpp stringcode_test.h
 stringcode_test_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT6_LIBS@ @MUSICBRAINZ_LIBS@ @IMAGEMAGICK_LIBS@
 

tests/sha1_test.cpp

@@ -0,0 +1,103 @@
+// sha1_test.h
+//
+// Test Rivendell SHA1 methods.
+//
+//   (C) Copyright 2025 Fred Gleason <fredg@paravelsystems.com>
+//
+//   This program is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License version 2 as
+//   published by the Free Software Foundation.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public
+//   License along with this program; if not, write to the Free Software
+//   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <QCoreApplication>
+
+#include <rdcmd_switch.h>
+#include <rdconf.h>
+#include <rdhash.h>
+
+#include "sha1_test.h"
+
+MainObject::MainObject(QObject *parent)
+  : QObject(parent)
+{
+  QString verify_filename;
+  QString verify_password;
+  QString verify_string;
+  QString verify_hash;
+
+  RDCmdSwitch *cmd=new RDCmdSwitch("sha1_test",SHA1_TEST_USAGE);
+  for(unsigned i=0;i<cmd->keys();i++) {
+    if(cmd->key(i)=="--verify-hash") {
+      verify_hash=cmd->value(i);
+      cmd->setProcessed(i,true);
+    }
+    if(cmd->key(i)=="--verify-filename") {
+      verify_filename=cmd->value(i);
+      cmd->setProcessed(i,true);
+    }
+    if(cmd->key(i)=="--verify-password") {
+      verify_password=cmd->value(i);
+      cmd->setProcessed(i,true);
+    }
+    if(cmd->key(i)=="--verify-string") {
+      verify_string=cmd->value(i);
+      cmd->setProcessed(i,true);
+    }
+    if(!cmd->processed(i)) {
+      fprintf(stderr,"sha1_test: unknown option\n");
+      exit(1);
+    }
+  }
+
+  if(!verify_password.isEmpty()) {
+    if(verify_hash.isEmpty()) {
+      QString hash=RDSha1HashPassword(verify_password);
+      printf("HASH: %s\n",hash.toUtf8().constData());
+      printf("VERIFIED: %s\n",
+	     RDYesNo(RDSha1HashCheckPassword(verify_password,hash)).
+	     toUtf8().constData());
+    }
+    else {
+      printf("VERIFIED: %s\n",
+	     RDYesNo(RDSha1HashCheckPassword(verify_password,verify_hash)).
+	     toUtf8().constData());
+    }
+    exit(0);
+  }
+
+  if(!verify_string.isEmpty()) {
+    printf("STRING: %s\n",verify_string.toUtf8().constData());
+    printf("HASH: %s\n",RDSha1HashData(verify_string.toUtf8()).
+	   toUtf8().constData());
+    exit(0);
+  }
+
+  if(!verify_filename.isEmpty()) {
+    printf("FILE: %s\n",verify_filename.toUtf8().constData());
+    printf("HASH: %s\n",RDSha1HashFile(verify_filename.toUtf8()).
+	   toUtf8().constData());
+    exit(0);
+  }
+
+  exit(0);
+}
+
+
+int main(int argc,char *argv[])
+{
+  QCoreApplication a(argc,argv);
+  new MainObject();
+  return a.exec();
+}

tests/sha1_test.h

@@ -0,0 +1,36 @@
+// sha1_test.h
+//
+// Test Rivendell SHA1 methods.
+//
+//   (C) Copyright 2025 Fred Gleason <fredg@paravelsystems.com>
+//
+//   This program is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License version 2 as
+//   published by the Free Software Foundation.
+//
+//   This program is distributed in the hope that it will be useful,
+//   but WITHOUT ANY WARRANTY; without even the implied warranty of
+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//   GNU General Public License for more details.
+//
+//   You should have received a copy of the GNU General Public
+//   License along with this program; if not, write to the Free Software
+//   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+//
+
+#ifndef SHA1_TEST_H
+#define SHA1_TEST_H
+
+#include <QObject>
+
+#define SHA1_TEST_USAGE "--verify-password=<passwd> --verify-string=<str> --verify-file=<filename> --verify-hash=<sha1-hash>"
+
+class MainObject : public QObject
+{
+  Q_OBJECT
+  public:
+    MainObject(QObject *parent=0);
+};
+
+
+#endif  // SHA1_TEST_H