generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-10-30 21:50:49 +01:00
Code Issues Projects Releases Wiki Activity

Revert "makes curve keys symetric as in libcurve + factorisation"

Browse Source 
This reverts commit bfd472f97c.
This commit is contained in:
Pieter Hintjens
2013-09-17 14:05:55 +02:00
parent 22eb4d600b
commit 825052f83f
8 changed files with 179 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/options.hpp
View File

@@ -42,9 +42,6 @@ namespace zmq
int setsockopt (int option_, const void *optval_, size_t optvallen_);
int getsockopt (int option_, void *optval_, size_t *optvallen_);
int setcurvekey (uint8_t* curve_key, const void *optval_, size_t optvallen_);
int getcurvekey (uint8_t* curve_key, void *optval_, size_t *optvallen_);
// High-water marks for message pipes.
int sndhwm;
int rcvhwm;
@@ -134,10 +131,9 @@ namespace zmq
std::string plain_password;
// Security credentials for CURVE mechanism
uint8_t curve_our_perma_pub_key [CURVE_KEYSIZE];
uint8_t curve_our_perma_sec_key [CURVE_KEYSIZE];
uint8_t curve_peer_perma_pub_key [CURVE_KEYSIZE];
uint8_t curve_peer_perma_sec_key [CURVE_KEYSIZE]; // normally unused - for test and possible future extensions
uint8_t curve_public_key [CURVE_KEYSIZE];
uint8_t curve_secret_key [CURVE_KEYSIZE];
uint8_t curve_server_key [CURVE_KEYSIZE];
// ID of the socket.
int socket_id;