diff options
| author | René Schümann <white06tiger@gmail.com> | 2015-03-26 20:38:11 +0000 |
|---|---|---|
| committer | René Schümann <white06tiger@gmail.com> | 2015-03-26 20:38:11 +0000 |
| commit | 1f7e069bda342dff43e2224060f10fcb098ea62a (patch) | |
| tree | a12ec12d646a4e3a7c97e062a3c8aa7730e4f6d4 /plugins/MirOTR/libotr/src/dh.h | |
| parent | 52c68e0b3cf78f578da1754fbd6589d1936804f9 (diff) | |
MirOTR: major update to latest libotr 4, with OTR protocol 3 (backwards compatible to 2 and 1, 1 is disabled by default)
NOTE: doesn't build yet, just new libotr without required changes to MirOTR itself
git-svn-id: http://svn.miranda-ng.org/main/trunk@12502 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MirOTR/libotr/src/dh.h')
| -rw-r--r-- | plugins/MirOTR/libotr/src/dh.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/MirOTR/libotr/src/dh.h b/plugins/MirOTR/libotr/src/dh.h index d68328f528..742c408042 100644 --- a/plugins/MirOTR/libotr/src/dh.h +++ b/plugins/MirOTR/libotr/src/dh.h @@ -1,6 +1,7 @@ /* * Off-the-Record Messaging library - * Copyright (C) 2004-2008 Ian Goldberg, Chris Alexander, Nikita Borisov + * Copyright (C) 2004-2012 Ian Goldberg, Chris Alexander, Willy Lew, + * Nikita Borisov * <otr@cypherpunks.ca> * * This library is free software; you can redistribute it and/or @@ -14,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __DH_H__ @@ -33,6 +34,8 @@ typedef enum { OTRL_SESSIONID_SECOND_HALF_BOLD } OtrlSessionIdHalf; +#define OTRL_EXTRAKEY_BYTES 32 + typedef struct { unsigned char sendctr[16]; unsigned char rcvctr[16]; @@ -44,6 +47,7 @@ typedef struct { gcry_md_hd_t rcvmac; unsigned char rcvmackey[20]; int rcvmacused; + unsigned char extrakey[OTRL_EXTRAKEY_BYTES]; } DH_sesskeys; /* @@ -70,7 +74,7 @@ void otrl_dh_keypair_free(DH_keypair *kp); /* * Generate a DH keypair for a specified group. - */ + */ gcry_error_t otrl_dh_gen_keypair(unsigned int groupid, DH_keypair *kp); /* |