X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=crypto.h;h=0a2d4869cea4679813929d6c33da8b85acd2da36;hb=3da25d864d1ffaefd67b464ae0f015107caa3d5e;hp=7b2b9921bca3c030b233834146beeeb0b2d60c87;hpb=927bd7b13c9a18fb07a8681c7483f632c7ea32f3;p=xonotic%2Fdarkplaces.git

diff --git a/crypto.h b/crypto.h
index 7b2b9921..0a2d4869 100644
--- a/crypto.h
+++ b/crypto.h
@@ -20,9 +20,11 @@ typedef struct
 {
 	unsigned char dhkey[DHKEY_SIZE]; // shared key, not NUL terminated
 	char client_idfp[FP64_SIZE+1];
-	char client_keyfp[FP64_SIZE+1]; // NULL if signature fail
+	char client_keyfp[FP64_SIZE+1];
+	qboolean client_issigned;
 	char server_idfp[FP64_SIZE+1];
-	char server_keyfp[FP64_SIZE+1]; // NULL if signature fail
+	char server_keyfp[FP64_SIZE+1];
+	qboolean server_issigned;
 	qboolean authenticated;
 	qboolean use_aes;
 	void *data;
@@ -31,7 +33,7 @@ crypto_t;
 
 void Crypto_Init(void);
 void Crypto_Init_Commands(void);
-void Crypto_LoadKeys(void);
+void Crypto_LoadKeys(void); // NOTE: when this is called, the SV_LockThreadMutex MUST be active
 void Crypto_Shutdown(void);
 qboolean Crypto_Available(void);
 void sha256(unsigned char *out, const unsigned char *in, int n); // may ONLY be called if Crypto_Available()
@@ -48,13 +50,13 @@ int Crypto_ServerParsePacket(const char *data_in, size_t len_in, char *data_out,
 
 qboolean Crypto_ServerAppendToChallenge(const char *data_in, size_t len_in, char *data_out, size_t *len_out, size_t maxlen);
 crypto_t *Crypto_ServerGetInstance(lhnetaddress_t *peeraddress);
-qboolean Crypto_ServerFinishInstance(crypto_t *out, crypto_t *in); // also clears allocated memory
+qboolean Crypto_FinishInstance(crypto_t *out, crypto_t *in); // also clears allocated memory, and frees the instance received by ServerGetInstance
 const char *Crypto_GetInfoResponseDataString(void);
 
 // retrieves a host key for an address (can be exposed to menuqc, or used by the engine to look up stored keys e.g. for server bookmarking)
 // pointers may be NULL
-qboolean Crypto_RetrieveHostKey(lhnetaddress_t *peeraddress, int *keyid, char *keyfp, size_t keyfplen, char *idfp, size_t idfplen, int *aeslevel);
-int Crypto_RetrieveLocalKey(int keyid, char *keyfp, size_t keyfplen, char *idfp, size_t idfplen); // return value: -1 if more to come, +1 if valid, 0 if end of list
+qboolean Crypto_RetrieveHostKey(lhnetaddress_t *peeraddress, int *keyid, char *keyfp, size_t keyfplen, char *idfp, size_t idfplen, int *aeslevel, qboolean *issigned);
+int Crypto_RetrieveLocalKey(int keyid, char *keyfp, size_t keyfplen, char *idfp, size_t idfplen, qboolean *issigned); // return value: -1 if more to come, +1 if valid, 0 if end of list
 
 size_t Crypto_SignData(const void *data, size_t datasize, int keyid, void *signed_data, size_t signed_size);
 size_t Crypto_SignDataDetached(const void *data, size_t datasize, int keyid, void *signed_data, size_t signed_size);