aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDavid M. Syzdek <david@syzdek.net>2023-01-11 16:24:54 -0900
committerDavid M. Syzdek <david@syzdek.net>2023-01-11 16:24:54 -0900
commit8892a6badbf622c84b918ef879a712ad5552f9f8 (patch)
tree5231d181c5f28e33e005516622dad48dfc5c6d0c
parentde173b494375c78fd6ffc954ef332b9c4fb976c1 (diff)
downloadotputils-8892a6badbf622c84b918ef879a712ad5552f9f8.tar.gz
otputils-8892a6badbf622c84b918ef879a712ad5552f9f8.tar.bz2
otputils-8892a6badbf622c84b918ef879a712ad5552f9f8.tar.xz
otputils-8892a6badbf622c84b918ef879a712ad5552f9f8.zip
autotools: adding checks for EVP_sha3_256() and EVP_sha3_512()
-rw-r--r--configure.ac2
-rw-r--r--lib/libotputil/lmisc.c8
2 files changed, 10 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 7201868..c06dda1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,6 +170,8 @@ AC_SEARCH_LIBS([EVP_sha256], [crypto], [], [AC_MSG_ERROR([OpenSSL is require
170AC_SEARCH_LIBS([EVP_sha512], [crypto], [], [AC_MSG_ERROR([OpenSSL is required])], []) 170AC_SEARCH_LIBS([EVP_sha512], [crypto], [], [AC_MSG_ERROR([OpenSSL is required])], [])
171AC_SEARCH_LIBS([HMAC], [crypto], [], [AC_MSG_ERROR([OpenSSL is required])], []) 171AC_SEARCH_LIBS([HMAC], [crypto], [], [AC_MSG_ERROR([OpenSSL is required])], [])
172AC_CHECK_FUNCS([EVP_MD_get0_name], [], []) 172AC_CHECK_FUNCS([EVP_MD_get0_name], [], [])
173AC_CHECK_FUNCS([EVP_sha3_256], [], [])
174AC_CHECK_FUNCS([EVP_sha3_512], [], [])
173 175
174# GNU Libtool Support 176# GNU Libtool Support
175LT_INIT(dlopen disable-fast-install) 177LT_INIT(dlopen disable-fast-install)
diff --git a/lib/libotputil/lmisc.c b/lib/libotputil/lmisc.c
index 6d31ea5..4b62d1e 100644
--- a/lib/libotputil/lmisc.c
+++ b/lib/libotputil/lmisc.c
@@ -64,8 +64,12 @@ static const otputil_map_t otputil_md_list[] =
64 { .map_name = "sha1", .map_id = OTPUTIL_MD_SHA1 }, 64 { .map_name = "sha1", .map_id = OTPUTIL_MD_SHA1 },
65 { .map_name = "sha256", .map_id = OTPUTIL_MD_SHA256 }, 65 { .map_name = "sha256", .map_id = OTPUTIL_MD_SHA256 },
66 { .map_name = "sha512", .map_id = OTPUTIL_MD_SHA512 }, 66 { .map_name = "sha512", .map_id = OTPUTIL_MD_SHA512 },
67#ifdef HAVE_EVP_SHA3_256
67 { .map_name = "sha3-256", .map_id = OTPUTIL_MD_SHA3_256 }, 68 { .map_name = "sha3-256", .map_id = OTPUTIL_MD_SHA3_256 },
69#endif
70#ifdef HAVE_EVP_SHA3_512
68 { .map_name = "sha3-512", .map_id = OTPUTIL_MD_SHA3_512 }, 71 { .map_name = "sha3-512", .map_id = OTPUTIL_MD_SHA3_512 },
72#endif
69 { .map_name = NULL, .map_id = 0 }, 73 { .map_name = NULL, .map_id = 0 },
70}; 74};
71 75
@@ -107,8 +111,12 @@ otputil_evp_md(
107 case OTPUTIL_MD_SHA1: return(EVP_sha1()); 111 case OTPUTIL_MD_SHA1: return(EVP_sha1());
108 case OTPUTIL_MD_SHA256: return(EVP_sha256()); 112 case OTPUTIL_MD_SHA256: return(EVP_sha256());
109 case OTPUTIL_MD_SHA512: return(EVP_sha512()); 113 case OTPUTIL_MD_SHA512: return(EVP_sha512());
114#ifdef HAVE_EVP_SHA3_256
110 case OTPUTIL_MD_SHA3_256: return(EVP_sha3_256()); 115 case OTPUTIL_MD_SHA3_256: return(EVP_sha3_256());
116#endif
117#ifdef HAVE_EVP_SHA3_512
111 case OTPUTIL_MD_SHA3_512: return(EVP_sha3_512()); 118 case OTPUTIL_MD_SHA3_512: return(EVP_sha3_512());
119#endif
112 default: break; 120 default: break;
113 }; 121 };
114 return(NULL); 122 return(NULL);