3rd_party/libsrp6a-sha512: Replace/Remove OpenSSL-3.0-deprecated API

Author: nikias

3rd_party/libsrp6a-sha512/t_math.c

@@ -39,11 +39,13 @@ typedef BIGNUM * BigInteger;
 typedef BN_CTX * BigIntegerCtx;
 typedef BN_MONT_CTX * BigIntegerModAccel;
 #include <limits.h>
+#if OPENSSL_VERSION_NUMBER < 0x30000000L
 # ifndef OPENSSL_NO_ENGINE
 #  define OPENSSL_ENGINE
 #  include "openssl/engine.h"
 static ENGINE * default_engine = NULL;
 # endif /* OPENSSL_ENGINE */
+#endif
 typedef int (*modexp_meth)(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 			   const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *mctx);
 static modexp_meth default_modexp = NULL;
@@ -758,7 +760,11 @@ BigIntegerCheckPrime(BigInteger n, BigIntegerCtx c)
   if(c == NULL)
     c = ctx = BN_CTX_new();
 #if OPENSSL_VERSION_NUMBER >= 0x00908000
-  rv = BN_is_prime_ex(n, 25, c, NULL);
+  #if OPENSSL_VERSION_NUMBER >= 0x30000000L
+    rv = BN_check_prime(n, c, NULL);
+  #else
+    rv = BN_is_prime_ex(n, 25, c, NULL);
+  #endif
 #else
   rv = BN_is_prime(n, 25, NULL, c, NULL);
 #endif

3rd_party/libsrp6a-sha512/t_misc.c

@@ -63,7 +63,7 @@ static unsigned char crpool[64];
 static unsigned char randpool[SHA_DIGESTSIZE], randout[SHA_DIGESTSIZE];
 static unsigned long randcnt = 0;
 static unsigned int outpos = 0;
-SHA1_CTX randctxt;
+SHA512_CTX randctxt;
 #endif /* OPENSSL */
 
 /*
@@ -84,15 +84,15 @@ t_envhash(unsigned char * out)
 {
   char ** ptr;
   char ebuf[256];
-  SHA1_CTX ctxt;
+  SHA512_CTX ctxt;
 
-  SHA1Init(&ctxt);
+  SHA512Init(&ctxt);
   for(ptr = environ; *ptr; ++ptr) {
     strncpy(ebuf, *ptr, 255);
     ebuf[255] = '\0';
-    SHA1Update(&ctxt, ebuf, strlen(ebuf));
+    SHA512Update(&ctxt, ebuf, strlen(ebuf));
   }
-  SHA1Final(out, &ctxt);
+  SHA512Final(out, &ctxt);
 }
 
 /*
@@ -118,13 +118,13 @@ t_fshash(unsigned char * out)
 {
   char dotpath[128];
   struct stat st;
-  SHA1_CTX ctxt;
+  SHA512_CTX ctxt;
   int i, pinode;
   dev_t pdev;
 
-  SHA1Init(&ctxt);
+  SHA512Init(&ctxt);
   if(stat(".", &st) >= 0) {
-    SHA1Update(&ctxt, (unsigned char *) &st, sizeof(st));
+    SHA512Update(&ctxt, (unsigned char *) &st, sizeof(st));
     pinode = st.st_ino;
     pdev = st.st_dev;
     strcpy(dotpath, "..");
@@ -133,22 +133,22 @@ t_fshash(unsigned char * out)
 	break;
       if(st.st_ino == pinode && st.st_dev == pdev)
 	break;
-      SHA1Update(&ctxt, (unsigned char *) &st, sizeof(st));
+      SHA512Update(&ctxt, (unsigned char *) &st, sizeof(st));
       pinode = st.st_ino;
       pdev = st.st_dev;
       strcat(dotpath, "/..");
     }
   }
 
   if(fstat(0, &st) >= 0)
-    SHA1Update(&ctxt, (unsigned char *) &st, sizeof(st));
+    SHA512Update(&ctxt, (unsigned char *) &st, sizeof(st));
 
   sprintf(dotpath, "/tmp/rnd.%d", getpid());
   if(creat(dotpath, 0600) >= 0 && stat(dotpath, &st) >= 0)
-    SHA1Update(&ctxt, (unsigned char *) &st, sizeof(st));
+    SHA512Update(&ctxt, (unsigned char *) &st, sizeof(st));
   unlink(dotpath);
 
-  SHA1Final(out, &ctxt);
+  SHA512Final(out, &ctxt);
 }
 
 /*
@@ -191,7 +191,6 @@ unsigned long raw_truerand();
 static void
 t_initrand()
 {
-  SHA1_CTX ctxt;
 #ifdef USE_FTIME
   struct timeb t;
 #else
@@ -271,9 +270,10 @@ t_initrand()
 #elif defined(GCRYPT)
   gcry_random_add_bytes((unsigned char *)&preseed, sizeof(preseed), -1);
 #else
-  SHA1Init(&ctxt);
-  SHA1Update(&ctxt, (unsigned char *) &preseed, sizeof(preseed));
-  SHA1Final(randpool, &ctxt);
+  SHA512_CTX ctxt;
+  SHA512Init(&ctxt);
+  SHA512Update(&ctxt, (unsigned char *) &preseed, sizeof(preseed));
+  SHA512Final(randpool, &ctxt);
   memset((unsigned char *) &ctxt, 0, sizeof(ctxt));
   outpos = 0;
 #endif /* OPENSSL */
@@ -340,13 +340,13 @@ t_random(unsigned char * data, unsigned size)
     }
 
     /* Recycle */
-    SHA1Init(&randctxt);
-    SHA1Update(&randctxt, randpool, sizeof(randpool));
-    SHA1Final(randout, &randctxt);
-    SHA1Init(&randctxt);
-    SHA1Update(&randctxt, (unsigned char *) &randcnt, sizeof(randcnt));
-    SHA1Update(&randctxt, randpool, sizeof(randpool));
-    SHA1Final(randpool, &randctxt);
+    SHA512Init(&randctxt);
+    SHA512Update(&randctxt, randpool, sizeof(randpool));
+    SHA512Final(randout, &randctxt);
+    SHA512Init(&randctxt);
+    SHA512Update(&randctxt, (unsigned char *) &randcnt, sizeof(randcnt));
+    SHA512Update(&randctxt, randpool, sizeof(randpool));
+    SHA512Final(randpool, &randctxt);
     ++randcnt;
     outpos = sizeof(randout);
   }
@@ -370,7 +370,7 @@ t_sessionkey(unsigned char * key, unsigned char * sk, unsigned sklen)
   unsigned i, klen;
   unsigned char * hbuf;
   unsigned char hout[SHA_DIGESTSIZE];
-  SHA1_CTX ctxt;
+  SHA512_CTX ctxt;
 
   while(sklen > 0 && *sk == 0) {	/* Skip leading 0's */
     --sklen;
@@ -383,17 +383,17 @@ t_sessionkey(unsigned char * key, unsigned char * sk, unsigned sklen)
 
   for(i = 0; i < klen; ++i)
     hbuf[i] = sk[sklen - 2 * i - 1];
-  SHA1Init(&ctxt);
-  SHA1Update(&ctxt, hbuf, klen);
-  SHA1Final(hout, &ctxt);
+  SHA512Init(&ctxt);
+  SHA512Update(&ctxt, hbuf, klen);
+  SHA512Final(hout, &ctxt);
   for(i = 0; i < sizeof(hout); ++i)
     key[2 * i] = hout[i];
 
   for(i = 0; i < klen; ++i)
     hbuf[i] = sk[sklen - 2 * i - 2];
-  SHA1Init(&ctxt);
-  SHA1Update(&ctxt, hbuf, klen);
-  SHA1Final(hout, &ctxt);
+  SHA512Init(&ctxt);
+  SHA512Update(&ctxt, hbuf, klen);
+  SHA512Final(hout, &ctxt);
   for(i = 0; i < sizeof(hout); ++i)
     key[2 * i + 1] = hout[i];
 
@@ -406,7 +406,7 @@ t_sessionkey(unsigned char * key, unsigned char * sk, unsigned sklen)
 _TYPE( void )
 t_mgf1(unsigned char * mask, unsigned masklen, const unsigned char * seed, unsigned seedlen)
 {
-  SHA1_CTX ctxt;
+  SHA512_CTX ctxt;
   unsigned i = 0;
   unsigned pos = 0;
   unsigned char cnt[4];
@@ -417,17 +417,17 @@ t_mgf1(unsigned char * mask, unsigned masklen, const unsigned char * seed, unsig
     cnt[1] = (i >> 16) & 0xFF;
     cnt[2] = (i >> 8) & 0xFF;
     cnt[3] = i & 0xFF;
-    SHA1Init(&ctxt);
-    SHA1Update(&ctxt, seed, seedlen);
-    SHA1Update(&ctxt, cnt, 4);
+    SHA512Init(&ctxt);
+    SHA512Update(&ctxt, seed, seedlen);
+    SHA512Update(&ctxt, cnt, 4);
 
     if(pos + SHA_DIGESTSIZE > masklen) {
-      SHA1Final(hout, &ctxt);
+      SHA512Final(hout, &ctxt);
       memcpy(mask + pos, hout, masklen - pos);
       pos = masklen;
     }
     else {
-      SHA1Final(mask + pos, &ctxt);
+      SHA512Final(mask + pos, &ctxt);
       pos += SHA_DIGESTSIZE;
     }
 

3rd_party/libsrp6a-sha512/t_sha.h

@@ -9,7 +9,7 @@
 #endif
 #endif
 
-#define SHA_DIGESTSIZE 20
+#define SHA_DIGESTSIZE 64
 
 #ifdef OPENSSL
 #define OPENSSL_SHA 1