Nasal: md5 is now in simgear.

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index 9ac7302634266a23e1651eb5c9a5fdd08e21b25f..fde6319dbd3949b97ef1383ebc39dc16a21d76c1 100644 (file)
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -28,7 +28,6 @@
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/structure/event_mgr.hxx>
 #include <simgear/debug/BufferedLogCallback.hxx>
-#include <simgear/package/md5.h>
 
 #include <simgear/nasal/cppbind/from_nasal.hxx>
 #include <simgear/nasal/cppbind/to_nasal.hxx>
@@ -719,26 +718,13 @@ static naRef f_parse_markdown(naContext c, naRef me, int argc, naRef* args)
  */
 static naRef f_md5(naContext c, naRef me, int argc, naRef* args)
 {
-  nasal::CallContext ctx(c, argc, args);
-  std::string const str = ctx.requireArg<std::string>(0);
-
-  SG_MD5_CTX md5_ctx;
-  SG_MD5Init(&md5_ctx);
-  SG_MD5Update(&md5_ctx, (unsigned char*)str.c_str(), str.size());
-
-  unsigned char digest[MD5_DIGEST_LENGTH];
-  SG_MD5Final(digest, &md5_ctx);
-
-  // TODO make something more generic
-  // convert final sum to hex
-  const char hexChar[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-  std::stringstream hexMd5;
-  for (int i=0; i<MD5_DIGEST_LENGTH;++i) {
-      hexMd5 << hexChar[digest[i] >> 4];
-      hexMd5 << hexChar[digest[i] & 0x0f];
-  }
+  if( argc != 1 || !naIsString(args[0]) )
+    naRuntimeError(c, "md5(): wrong type or number of arguments");
 
-  return ctx.to_nasal(hexMd5.str());
+  return nasal::to_nasal(
+    c,
+    simgear::strutils::md5(naStr_data(args[0]), naStr_len(args[0]))
+  );
 }
 
 // Return UNIX epoch time in seconds.