X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=mvm_cmds.c;h=ace22bfa74c2ac5009dcde180ea00b2adb0e7dea;hb=ed383adf3a79182b3f3fd2c31bcd7a05693a4194;hp=d44d22c363ef7020b93c0bdb657a4b51ba7bf4ec;hpb=e57627ff250e40f1858767f25c60ef65b3397587;p=xonotic%2Fdarkplaces.git

diff --git a/mvm_cmds.c b/mvm_cmds.c
index d44d22c3..ace22bfa 100644
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -809,7 +809,7 @@ static void VM_M_crypto_getkeyfp(prvm_prog_t *prog)
 	s = PRVM_G_STRING( OFS_PARM0 );
 	VM_CheckEmptyString( prog, s );
 
-	if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, keyfp, sizeof(keyfp), NULL, 0, NULL))
+	if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, keyfp, sizeof(keyfp), NULL, 0, NULL, NULL))
 		PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, keyfp );
 	else
 		PRVM_G_INT( OFS_RETURN ) = OFS_NULL;
@@ -825,11 +825,27 @@ static void VM_M_crypto_getidfp(prvm_prog_t *prog)
 	s = PRVM_G_STRING( OFS_PARM0 );
 	VM_CheckEmptyString( prog, s );
 
-	if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, NULL, 0, idfp, sizeof(idfp), NULL))
+	if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, NULL, 0, idfp, sizeof(idfp), NULL, NULL))
 		PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString( prog, idfp );
 	else
 		PRVM_G_INT( OFS_RETURN ) = OFS_NULL;
 }
+static void VM_M_crypto_getidstatus(prvm_prog_t *prog)
+{
+	lhnetaddress_t addr;
+	const char *s;
+	qboolean issigned;
+
+	VM_SAFEPARMCOUNT(1,VM_M_crypto_getidstatus);
+
+	s = PRVM_G_STRING( OFS_PARM0 );
+	VM_CheckEmptyString( prog, s );
+
+	if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, NULL, 0, NULL, 0, NULL, &issigned))
+		PRVM_G_FLOAT( OFS_RETURN ) = issigned ? 2 : 1;
+	else
+		PRVM_G_FLOAT( OFS_RETURN ) = 0;
+}
 static void VM_M_crypto_getencryptlevel(prvm_prog_t *prog)
 {
 	lhnetaddress_t addr;
@@ -842,7 +858,7 @@ static void VM_M_crypto_getencryptlevel(prvm_prog_t *prog)
 	s = PRVM_G_STRING( OFS_PARM0 );
 	VM_CheckEmptyString( prog, s );
 
-	if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, NULL, 0, NULL, 0, &aeslevel))
+	if(LHNETADDRESS_FromString(&addr, s, 26000) && Crypto_RetrieveHostKey(&addr, NULL, NULL, 0, NULL, 0, &aeslevel, NULL))
 		PRVM_G_INT( OFS_RETURN ) = PRVM_SetTempString(prog, aeslevel ? va(vabuf, sizeof(vabuf), "%d AES128", aeslevel) : "0");
 	else
 		PRVM_G_INT( OFS_RETURN ) = OFS_NULL;
@@ -1585,6 +1601,7 @@ VM_digest_hex,						// #639
 NULL,							// #640
 VM_M_crypto_getmyidstatus,				// #641 float(float i) crypto_getmyidstatus
 VM_coverage,						// #642
+VM_M_crypto_getidstatus,				// #643 float(string addr) crypto_getidstatus
 NULL
 };