Skip to content

Commit

Permalink
Switched from OpenSSL to gcrypt in submodules.
Browse files Browse the repository at this point in the history 
This fixes #2, and maybe also #8.
  • Loading branch information
@gkdr
gkdr committed Feb 4, 2017
1 parent 60edaac commit 45ba650
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
6 changes: 1 addition & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,8 @@ Mostly, but I only tried it briefly.
It only uses libpurple functions, so if they are implemented in the client correctly, they should work.
That being said, indicating encrypted chats by setting the topic does not seem to work in Finch (maybe just because window titles are very short). The encryption itself does work though, which you can confirm by looking at the sent/received messages in the debug log.

## Dependencies (aside from libpurple)
* [axc](https://github.com/gkdr/axc)
* [libomemo](https://github.com/gkdr/libomemo)

## Installation
1. Install the (submodules') dependencies (`libpurple-dev`, `libmxml-dev`, `libsqlite3-dev`, `libssl-dev`)
1. Install the (submodules') dependencies (`libpurple-dev`, `libmxml-dev`, `libsqlite3-dev`, `libgcrypt20-dev`)
1. `git clone https://github.com/gkdr/lurch/`
2. `cd lurch`
3. `git submodule update --init`
Expand Down
2 changes: 1 addition & 1 deletion lib/axc
Submodule axc updated 4 files
+6 −5 README.md
+7 −4 makefile
+295 −184 src/axc_crypto.c
+1 −1 test/test_client.c
2 changes: 1 addition & 1 deletion lib/libomemo
Submodule libomemo updated 4 files
+4 −4 README.md
+6 −2 makefile
+67 −113 src/libomemo_crypto.c
+0 −2 test/test_libomemo.c
4 changes: 2 additions & 2 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ FILES=$(LOMEMO_FILES) $(AXC_FILES)
HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC) -I$(AX_DIR)/src

PKGCFG_C=$(shell pkg-config --cflags glib-2.0 purple) $(shell xml2-config --cflags)
PKGCFG_L=$(shell pkg-config --libs purple glib-2.0 sqlite3) $(shell xml2-config --libs) -L$(shell pkg-config --variable=plugindir purple)
PKGCFG_L=$(shell pkg-config --libs purple glib-2.0 sqlite3 mxml) $(shell xml2-config --libs) -L$(shell pkg-config --variable=plugindir purple) $(shell libgcrypt-config --libs)

CFLAGS=-std=c11 -Wall -Wstrict-overflow -D_XOPEN_SOURCE=700 -D_BSD_SOURCE $(PKGCFG_C) $(HEADERS)
LFLAGS=-lmxml -pthread -ldl -lm -lcrypto $(PKGCFG_L) -ljabber -Wl,--whole-archive $(AX_DIR)/build/src/libaxolotl-c.a -Wl,--no-whole-archive
LFLAGS=-pthread -ldl -lm $(PKGCFG_L) -ljabber -Wl,--whole-archive $(AX_DIR)/build/src/libaxolotl-c.a -Wl,--no-whole-archive


all: lurch
Expand Down

0 comments on commit 45ba650

Please # to comment.