Add local copy of secp256k1 incase it isn't found by pkg-config

.gitignore

@@ -9,7 +9,6 @@ modules
 missing
 *.lo
 *.la
-config.*
 .deps
 .gdbinit
 .gdbinit.default
@@ -30,3 +29,39 @@ mkinstalldirs
 run-tests.php
 tags
 vendor
+.deps
+CMakeLists.txt
+*.lo
+*.la
+.libs
+acinclude.m4
+aclocal.m4
+autom4te.cache
+build
+config.guess
+config.h
+config.h.in
+config.log
+config.nice
+config.status
+config.sub
+configure
+configure.in
+include
+install-sh
+libtool
+ltmain.sh
+Makefile
+Makefile.fragments
+Makefile.global
+Makefile.objects
+missing
+mkinstalldirs
+modules
+run-tests.php
+tests/*/*.diff
+tests/*/*.out
+tests/*/*.php
+tests/*/*.exp
+tests/*/*.log
+tests/*/*.sh

.travis.yml

@@ -5,21 +5,18 @@ php:
     - 5.4
     - 5.5
     - 5.6
-
-before_install:
-#    - sudo apt-get update -qq
-    - sudo apt-get install -qq libssl-dev
+env:
+    - EXT_SUDO=
+    - EXT_SUDO=yes
 
 install:
     - |
-        git clone git://github.com/bitcoin/secp256k1.git libsecp256k1 \
-        && cd libsecp256k1 \
-        && ./autogen.sh && ./configure --enable-module-recovery && make && sudo make install \
-        && cd ..
-    - |
-        cd secp256k1 \
-        && phpize && ./configure && make && sudo make install \
-        && cd ..
+        sh -c 'if [ "$EXT_SUDO" != "" ]; then \
+            git clone https://github.com/bitcoin/secp256k1.git libsecp256k1 \
+            && cd libsecp256k1 \
+            && ./autogen.sh && ./configure --enable-module-recovery && make && sudo make install \
+            && cd ..; fi'
+    - phpize && ./configure --with-secp256k1 && make 
     - composer update
 
 before_script:
@@ -28,11 +25,7 @@ before_script:
     - phpenv version-name
 
 script:
-    - |
-        cd libsecp256k1 \
-        && ./tests \
-        && cd ..
-    - php -dextension=secp256k1.so vendor/phpunit/phpunit/phpunit tests/
+    - php -d"extension=modules/secp256k1.so" vendor/phpunit/phpunit/phpunit tests/
 
 notifications:
   webhooks:

config.m4

@@ -0,0 +1,54 @@
+dnl $Id$
+dnl config.m4 for extension secp256k1
+
+PHP_ARG_WITH(secp256k1, for secp256k1 support,
+dnl Make sure that the comment is aligned:
+[  --with-secp256k1             Include secp256k1 support])
+
+if test "$PHP_SECP256K1" != "no"; then
+  dnl Write more examples of tests her
+
+  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+  dnl system libsecp256k1, depends on libsecp256k1
+  AC_MSG_CHECKING(for libsecp256k1)
+
+  if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libsecp256k1; then
+    if $PKG_CONFIG libsecp256k1 --atleast-version 0.1; then
+      LIBSECP256K1_CFLAGS=`$PKG_CONFIG libsecp256k1 --cflags`
+      LIBSECP256K1_LIBDIR=`$PKG_CONFIG libsecp256k1 --variable=libdir`
+      LIBSECP256K1_VERSION=`$PKG_CONFIG libsecp256k1 --modversion`
+      AC_MSG_RESULT(from pkgconfig: version $LIBSECP256K1_VERSION found in $LIBSECP256K1_LIBDIR)
+
+    else
+      AC_MSG_ERROR(system libsecp2561 must be upgraded to version >= 0.11)
+    fi
+
+    PHP_CHECK_LIBRARY(secp256k1, secp256k1_context_create,
+    [
+      PHP_ADD_LIBRARY_WITH_PATH(secp256k1, $LIBSECP256K1_LIBDIR, SECP256K1_SHARED_LIBADD)
+      AC_DEFINE(HAVE_LIBSECP256K1,1,[ ])
+      AC_DEFINE(HAVE_SECP256K1,1,[ ])
+    ], [
+      AC_MSG_ERROR(could not find usable libsecp256k1)
+    ], [
+      -L$LIBSECP256K1_LIBDIR
+    ])
+
+    PHP_SUBST(SECP256K1_SHARED_LIBADD)
+    PHP_NEW_EXTENSION(secp256k1, secp256k1.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+
+  else
+
+    PHP_SECP256K1_SOURCES="$PHP_SECP256K1_SOURCES secp256k1/src/secp256k1.c  "
+
+    AC_DEFINE(HAVE_SECP256K1,1,[ ])
+    PHP_NEW_EXTENSION(secp256k1, secp256k1.c $PHP_SECP256K1_SOURCES, $ext_shared,, -Lsecp256k1/.libs -lgmp)
+    PHP_ADD_INCLUDE([$ext_srcdir/secp256k1])
+    PHP_ADD_INCLUDE([$ext_srcdir/secp256k1/include])
+    PHP_ADD_BUILD_DIR($ext_builddir/secp256k1/src, 1)
+    PHP_SUBST(SECP256K1_SHARED_LIBADD)
+
+  fi
+
+fi

secp256k1/php_secp256k1.h → php_secp256k1.h

@@ -1,7 +1,10 @@
 /* $Id$ */
+
+
 #include <secp256k1.h>
 #include <secp256k1_recovery.h>
 
+
 #ifndef PHP_SECP256K1_H
 #define PHP_SECP256K1_H
 

secp256k1/secp256k1.c → secp256k1.c

@@ -8,6 +8,7 @@
 #include "php_ini.h"
 #include "ext/standard/info.h"
 #include "php_secp256k1.h"
+#include "zend_exceptions.h"
 
 static zend_class_entry *spl_ce_InvalidArgumentException;
 

secp256k1/.travis.yml

@@ -0,0 +1,63 @@
+language: c
+sudo: false
+addons:
+  apt:
+    packages: libgmp-dev
+compiler:
+  - clang
+  - gcc
+env:
+  global:
+    - FIELD=auto  BIGNUM=auto  SCALAR=auto  ENDOMORPHISM=no  STATICPRECOMPUTATION=yes  ASM=no  BUILD=check  EXTRAFLAGS=  HOST=  ECDH=no  schnorr=no  RECOVERY=no  EXPERIMENTAL=no
+  matrix:
+    - SCALAR=32bit    RECOVERY=yes
+    - SCALAR=32bit    FIELD=32bit       ECDH=yes  EXPERIMENTAL=yes
+    - SCALAR=64bit
+    - FIELD=64bit     RECOVERY=yes
+    - FIELD=64bit     ENDOMORPHISM=yes
+    - FIELD=64bit     ENDOMORPHISM=yes  ECDH=yes EXPERIMENTAL=yes
+    - FIELD=64bit                       ASM=x86_64
+    - FIELD=64bit     ENDOMORPHISM=yes  ASM=x86_64
+    - FIELD=32bit     SCHNORR=yes EXPERIMENTAL=yes
+    - FIELD=32bit     ENDOMORPHISM=yes
+    - BIGNUM=no
+    - BIGNUM=no       ENDOMORPHISM=yes SCHNORR=yes  RECOVERY=yes EXPERIMENTAL=yes
+    - BIGNUM=no       STATICPRECOMPUTATION=no
+    - BUILD=distcheck
+    - EXTRAFLAGS=CPPFLAGS=-DDETERMINISTIC
+    - EXTRAFLAGS=CFLAGS=-O0
+matrix:
+  fast_finish: true
+  include:
+    - compiler: clang
+      env: HOST=i686-linux-gnu ENDOMORPHISM=yes
+      addons:
+        apt:
+          packages:
+            - gcc-multilib
+            - libgmp-dev:i386
+    - compiler: clang
+      env: HOST=i686-linux-gnu
+      addons:
+        apt:
+          packages:
+            - gcc-multilib
+    - compiler: gcc
+      env: HOST=i686-linux-gnu ENDOMORPHISM=yes
+      addons:
+        apt:
+          packages:
+            - gcc-multilib
+    - compiler: gcc
+      env: HOST=i686-linux-gnu
+      addons:
+        apt:
+          packages:
+            - gcc-multilib
+            - libgmp-dev:i386
+before_script: ./autogen.sh
+script:
+ - if [ -n "$HOST" ]; then export USE_HOST="--host=$HOST"; fi
+ - if [ "x$HOST" = "xi686-linux-gnu" ]; then export CC="$CC -m32"; fi
+ - ./configure --enable-experimental=$EXPERIMENTAL --enable-endomorphism=$ENDOMORPHISM --with-field=$FIELD --with-bignum=$BIGNUM --with-scalar=$SCALAR --enable-ecmult-static-precomputation=$STATICPRECOMPUTATION --enable-module-ecdh=$ECDH --enable-module-schnorr=$SCHNORR --enable-module-recovery=$RECOVERY $EXTRAFLAGS $USE_HOST && make -j2 $BUILD
+os: linux

secp256k1/COPYING

@@ -0,0 +1,19 @@
+Copyright (c) 2013 Pieter Wuille
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

secp256k1/Makefile.am

@@ -0,0 +1,111 @@
+ACLOCAL_AMFLAGS = -I build-aux/m4
+
+lib_LTLIBRARIES = libsecp256k1.la
+include_HEADERS = include/secp256k1.h
+noinst_HEADERS =
+noinst_HEADERS += src/scalar.h
+noinst_HEADERS += src/scalar_4x64.h
+noinst_HEADERS += src/scalar_8x32.h
+noinst_HEADERS += src/scalar_impl.h
+noinst_HEADERS += src/scalar_4x64_impl.h
+noinst_HEADERS += src/scalar_8x32_impl.h
+noinst_HEADERS += src/group.h
+noinst_HEADERS += src/group_impl.h
+noinst_HEADERS += src/num_gmp.h
+noinst_HEADERS += src/num_gmp_impl.h
+noinst_HEADERS += src/ecdsa.h
+noinst_HEADERS += src/ecdsa_impl.h
+noinst_HEADERS += src/eckey.h
+noinst_HEADERS += src/eckey_impl.h
+noinst_HEADERS += src/ecmult.h
+noinst_HEADERS += src/ecmult_impl.h
+noinst_HEADERS += src/ecmult_const.h
+noinst_HEADERS += src/ecmult_const_impl.h
+noinst_HEADERS += src/ecmult_gen.h
+noinst_HEADERS += src/ecmult_gen_impl.h
+noinst_HEADERS += src/num.h
+noinst_HEADERS += src/num_impl.h
+noinst_HEADERS += src/field_10x26.h
+noinst_HEADERS += src/field_10x26_impl.h
+noinst_HEADERS += src/field_5x52.h
+noinst_HEADERS += src/field_5x52_impl.h
+noinst_HEADERS += src/field_5x52_int128_impl.h
+noinst_HEADERS += src/field_5x52_asm_impl.h
+noinst_HEADERS += src/java/org_bitcoin_NativeSecp256k1.h
+noinst_HEADERS += src/util.h
+noinst_HEADERS += src/testrand.h
+noinst_HEADERS += src/testrand_impl.h
+noinst_HEADERS += src/hash.h
+noinst_HEADERS += src/hash_impl.h
+noinst_HEADERS += src/field.h
+noinst_HEADERS += src/field_impl.h
+noinst_HEADERS += src/bench.h
+noinst_HEADERS += contrib/lax_der_parsing.h
+noinst_HEADERS += contrib/lax_der_parsing.c
+noinst_HEADERS += contrib/lax_der_privatekey_parsing.h
+noinst_HEADERS += contrib/lax_der_privatekey_parsing.c
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libsecp256k1.pc
+
+libsecp256k1_la_SOURCES = src/secp256k1.c
+libsecp256k1_la_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src $(SECP_INCLUDES)
+libsecp256k1_la_LIBADD = $(SECP_LIBS)
+
+
+noinst_PROGRAMS =
+if USE_BENCHMARK
+noinst_PROGRAMS += bench_verify bench_sign bench_internal
+bench_verify_SOURCES = src/bench_verify.c
+bench_verify_LDADD = libsecp256k1.la $(SECP_LIBS) $(SECP_TEST_LIBS)
+bench_sign_SOURCES = src/bench_sign.c
+bench_sign_LDADD = libsecp256k1.la $(SECP_LIBS) $(SECP_TEST_LIBS)
+bench_internal_SOURCES = src/bench_internal.c
+bench_internal_LDADD = $(SECP_LIBS)
+bench_internal_CPPFLAGS = $(SECP_INCLUDES)
+endif
+
+if USE_TESTS
+noinst_PROGRAMS += tests
+tests_SOURCES = src/tests.c
+tests_CPPFLAGS = -DVERIFY -I$(top_srcdir)/src -I$(top_srcdir)/include $(SECP_INCLUDES) $(SECP_TEST_INCLUDES)
+tests_LDADD = $(SECP_LIBS) $(SECP_TEST_LIBS)
+tests_LDFLAGS = -static
+TESTS = tests
+endif
+
+if USE_ECMULT_STATIC_PRECOMPUTATION
+CPPFLAGS_FOR_BUILD +=-I$(top_srcdir)
+CFLAGS_FOR_BUILD += -Wall -Wextra -Wno-unused-function
+
+gen_context_OBJECTS = gen_context.o
+gen_context_BIN = gen_context$(BUILD_EXEEXT)
+gen_%.o: src/gen_%.c
+	$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c $< -o $@
+
+$(gen_context_BIN): $(gen_context_OBJECTS)
+	$(CC_FOR_BUILD) $^ -o $@
+
+$(libsecp256k1_la_OBJECTS): src/ecmult_static_context.h
+$(tests_OBJECTS): src/ecmult_static_context.h
+$(bench_internal_OBJECTS): src/ecmult_static_context.h
+
+src/ecmult_static_context.h: $(gen_context_BIN)
+	./$(gen_context_BIN)
+
+CLEANFILES = $(gen_context_BIN) src/ecmult_static_context.h
+endif
+
+EXTRA_DIST = autogen.sh src/gen_context.c src/basic-config.h
+
+if ENABLE_MODULE_ECDH
+include src/modules/ecdh/Makefile.am.include
+endif
+
+if ENABLE_MODULE_SCHNORR
+include src/modules/schnorr/Makefile.am.include
+endif
+
+if ENABLE_MODULE_RECOVERY
+include src/modules/recovery/Makefile.am.include
+endif