Commit 0d14efe7 authored by Richard Newton's avatar Richard Newton

Merge pull request #652 from hintjens/master

Minor fixes to project packaging
parents 0f7141c2 ac8c72ce
...@@ -22,6 +22,7 @@ autom4te.cache ...@@ -22,6 +22,7 @@ autom4te.cache
.*~ .*~
tools/curve_keygen.o tools/curve_keygen.o
tools/curve_keygen tools/curve_keygen
tests/test_ctx_destroy
tests/test_term_endpoint tests/test_term_endpoint
tests/test_system tests/test_system
tests/test_monitor tests/test_monitor
......
script: ./autogen.sh && ./configure && make && make check # libzmq
language: c language: c
# Build required projects first
before_script:
# libsodium
- git clone git://github.com/jedisct1/libsodium.git
- cd libsodium
- ./autogen.sh
- ./configure && make check
- sudo make install
- sudo ldconfig
- cd ..
# Build and check libzmq
script: ./autogen.sh && ./configure && make && make check
...@@ -49,8 +49,6 @@ static void zap_handler (void *ctx) ...@@ -49,8 +49,6 @@ static void zap_handler (void *ctx)
char *address = s_recv (zap); char *address = s_recv (zap);
char *identity = s_recv (zap); char *identity = s_recv (zap);
char *mechanism = s_recv (zap); char *mechanism = s_recv (zap);
printf ("CURVE domain=%s address=%s identity=%s mechanism=%s\n",
domain, address, identity, mechanism);
uint8_t client_key [32]; uint8_t client_key [32];
int size = zmq_recv (zap, client_key, 32, 0); int size = zmq_recv (zap, client_key, 32, 0);
assert (size == 32); assert (size == 32);
......
...@@ -43,8 +43,6 @@ zap_handler (void *ctx) ...@@ -43,8 +43,6 @@ zap_handler (void *ctx)
char *identity = s_recv (zap); char *identity = s_recv (zap);
char *mechanism = s_recv (zap); char *mechanism = s_recv (zap);
printf ("domain=%s address=%s identity=%s mechanism=%s\n",
domain, address, identity, mechanism);
assert (streq (version, "1.0")); assert (streq (version, "1.0"));
assert (streq (mechanism, "NULL")); assert (streq (mechanism, "NULL"));
assert (streq (identity, "IDENT")); assert (streq (identity, "IDENT"));
......
...@@ -43,8 +43,6 @@ zap_handler (void *ctx) ...@@ -43,8 +43,6 @@ zap_handler (void *ctx)
char *mechanism = s_recv (zap); char *mechanism = s_recv (zap);
char *username = s_recv (zap); char *username = s_recv (zap);
char *password = s_recv (zap); char *password = s_recv (zap);
printf ("PLAIN domain=%s address=%s identity=%s mechanism=%s\n",
domain, address, identity, mechanism);
assert (streq (version, "1.0")); assert (streq (version, "1.0"));
assert (streq (mechanism, "PLAIN")); assert (streq (mechanism, "PLAIN"));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment