diff options
| author | marijus <mario@mariovavti.com> | 2014-08-22 09:17:17 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-22 09:17:17 +0200 |
| commit | b0d52943e85bf819d4ddf91127ca25ec7a32c289 (patch) | |
| tree | fcb7c92735bbcbae9359d3fcf91a185226698426 /include/crypto.php | |
| parent | 1a3be504516db7106ea0ce385691e5a3eca4c084 (diff) | |
| parent | c5f4e5bac76de93b30c00fa9fb3dc8a559d7b070 (diff) | |
| download | volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.tar.gz volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.tar.bz2 volse-hubzilla-b0d52943e85bf819d4ddf91127ca25ec7a32c289.zip | |
Merge branch 'upstream'
Diffstat (limited to 'include/crypto.php')
| -rw-r--r-- | include/crypto.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/crypto.php b/include/crypto.php index c053dfae2..07655e24f 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -1,5 +1,8 @@ <?php /** @file */ +require_once('library/ASNValue.class.php'); +require_once('library/asn1.php'); + function rsa_sign($data,$key,$alg = 'sha256') { if(! $key) return 'no key'; @@ -241,7 +244,6 @@ function metopem($m,$e) { function pubrsatome($key,&$m,&$e) { require_once('library/asn1.php'); - require_once('include/salmon.php'); $lines = explode("\n",$key); unset($lines[0]); @@ -266,7 +268,6 @@ function pemtorsa($key) { } function pemtome($key,&$m,&$e) { - require_once('include/salmon.php'); $lines = explode("\n",$key); unset($lines[0]); unset($lines[count($lines)]); |