maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename "hash" to "hashString" and handle SHA-1

Browse source
This commit is contained in:
Eelco Dolstra 2013-02-08 19:36:23 +01:00
parent 01a5ea9914
commit 52172607cf
3 changed files with 15 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libexpr/primops.cc
View file

@ -1107,27 +1107,18 @@ static void prim_unsafeDiscardOutputDependency(EvalState & state, Value * * args
}
static void prim_hash(EvalState & state, Value * * args, Value & v)
/* Return the cryptographic hash of a string in base-16. */
static void prim_hashString(EvalState & state, Value * * args, Value & v)
{
PathSet context;
string type = state.forceStringNoCtx(*args[0]);
string s = state.forceStringNoCtx(*args[1]);
HashType ht = parseHashType(type);
if (ht == htUnknown)
throw Error(format("unknown hash type `%1%'") % type);
HashType ht;
if (type == "md5"){
ht = htMD5;
} else if (type == "sha256"){
ht = htSHA256;
} else {
throw Error(format("bad hash type `%1%'") % type);
}
PathSet context; // discarded
string s = state.forceString(*args[1], context);
Hash h = hashString(ht, s);
string hash = printHash(h);
mkString(v, hash, context);
mkString(v, printHash(hashString(ht, s)), context);
};
@ -1258,8 +1249,7 @@ void EvalState::createBaseEnv()
addPrimOp("__stringLength", 1, prim_stringLength);
addPrimOp("__unsafeDiscardStringContext", 1, prim_unsafeDiscardStringContext);
addPrimOp("__unsafeDiscardOutputDependency", 1, prim_unsafeDiscardOutputDependency);
addPrimOp("__hash", 2, prim_hash);
addPrimOp("__hashString", 2, prim_hashString);
// Versions
addPrimOp("__parseDrvName", 1, prim_parseDrvName);