sapphonie · sapphonie · Jul 14, 2023 · Jul 14, 2023 · Jul 14, 2023 · Jul 14, 2023
diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
@@ -1,57 +1,38 @@
-on:
-  push
+'on':
+  push:
+    tags:
+      - v*
 jobs:
-    compile:
-        name: Compile extension in docker
-        runs-on: ubuntu-latest
-        steps:
-          - name: Check out the repo
-            uses: actions/checkout@v2
-
-          - name: Run the build process with Docker
-            uses: addnab/docker-run-action@v3
-            with:
-                image: registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest
-                options: -v ${{ github.workspace }}:/mnt/curl
-                run: |
-                    bash /mnt/curl/ci/_docker_script.sh
-
-          - name: Zip packages
-            run: |
-              pwd
-              ls -la
-              mkdir build
-              cd build
-              mkdir scripting/include -p
-              mkdir extensions
-              mkdir plugins
-              cp ../Release/curl.ext.so extensions/ -v
-              7za a -r build/sm-neocurl.zip scripting/ plugins/ extensions/
-              ls -la
-              pwd
-
-          - name: Set Commit Hash
-            id: commit_info
-            run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
-
-          - name: Create Release
-            id: create_release
-            uses: actions/create-release@v1
-            env:
-              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            with:
-              tag_name: ${{ github.ref }}
-              release_name: ${{ github.ref }}
-              draft: false
-              prerelease: false
-
-          - name: Upload Release Asset
-            id: upload-release-asset
-            uses: actions/upload-release-asset@v1
-            env:
-              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            with:
-              upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
-              asset_path: ./build/stac.zip
-              asset_name: stac.zip
-              asset_content_type: application/zip
+  compile:
+    name: Compile extension in docker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      - name: Run the build process with Docker
+        uses: addnab/docker-run-action@v3
+        with:
+          image: 'debian:11-slim'
+          options: '-v ${{ github.workspace }}:/mnt/curl'
+          run: |
+            bash /mnt/curl/ci/_docker_script.sh
+      - name: Zip packages
+        run: |
+          pwd
+          ls -la
+          pushd build
+          7za a -r sm-neocurl.zip scripting/ plugins/ extensions/
+          ls -la
+          pwd
+          ls -la
+          popd
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            ./build/sm-neocurl.zip
+          fail_on_unmatched_files: true
+          generate_release_notes: true
+          # if: contains(github.ref, 'beta')
+          # prerelease: true
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@ mm-*
 test*
 Release/
 Debug/
+build
+build/*
diff --git a/.hgignore b/.hgignore
diff --git a/ci/_docker_script.sh b/ci/_docker_script.sh
@@ -1,10 +1,39 @@
 #!/bin/bash
-
-cd /mnt/curl/
+dpkg --add-architecture i386
+apt update
+apt install p7zip-full git ca-certificates build-essential g++-multilib -y --no-install-recommends
+# lib32stdc++-10-dev lib32z1-dev libc6-dev-i386 linux-libc-dev:i386
+cd /mnt/curl/ || exit
 git config --global --add safe.directory "*"
-rm -rf ./sm-1.11
-git clone https://github.com/alliedmodders/sourcemod --branch 1.11-dev sm-1.11 --recursive 
-rm -rf ./mm-1.11
-git clone https://github.com/alliedmodders/metamod-source --branch 1.11-dev mm-1.11 --recursive 
-make clean
-make
+rm -rf build
+mkdir build
+mkdir build/extensions  -p
+mkdir build/scripting   -p
+mkdir build/plugins     -p
+
+pushd build || exit
+    rm -rf ./sm-1.11
+    git clone https://github.com/alliedmodders/sourcemod        --branch 1.11-dev sm-1.11 --recursive 
+    rm -rf ./mm-1.11
+    git clone https://github.com/alliedmodders/metamod-source   --branch 1.11-dev mm-1.11 --recursive
+popd || exit
+
+pushd extension || exit
+    make clean
+    make
+    mv Release/curl.ext.so ../build/extensions/ -v
+    rm -rf Release
+popd || exit
+
+cp pawn/* build/ -Rfv
+
+# cleanup
+
+pushd build || exit
+    rm -rf ./sm-1.11
+    rm -rf ./mm-1.11
+
+    7za a -r sm-neocurl.zip scripting/ plugins/ extensions/
+popd || exit
+
+chmod 777 ./* -Rfv
diff --git a/ci/build.sh b/ci/build.sh
@@ -1,20 +1,23 @@
-sdfasd#!/bin/bash
+#!/bin/bash
 
 # we do this so that we can be agnostic about where we're invoked from
 # meaning you can exec this script anywhere and it should work the same
 thisiswhereiam=${BASH_SOURCE[0]}
 # this should be /whatever/directory/structure/Open-Fortress-Source
 script_folder=$( cd -- "$( dirname -- "${thisiswhereiam}" )" &> /dev/null && pwd )
+
 # this should be /whatever/directory/structure/[sdkmod-source]/build
 build_dir="build"
 
+img="registry.gitlab.steamos.cloud/steamrt/sniper/sdk"
+img="debian:11-slim"
 echo ${thisiswhereiam}
 echo ${script_folder}
 docker run -it \
 --mount type=bind,source=${script_folder}/../,target=/mnt/curl \
-registry.gitlab.steamos.cloud/steamrt/sniper/sdk \
-bash
-#/mnt/curl/ci/_docker_script.sh
+--user "$(id -u):$(id -g)" \
+${img} \
+bash /mnt/curl/ci/_docker_script.sh
 
 
 

diff --git a/Makefile → extension/Makefile b/Makefile → extension/Makefile
@@ -2,10 +2,10 @@
 # Makefile written by David "BAILOPAN" Anderson
 
 #SMSDK = ../..
-SMSDK = ./sm-1.11
+SMSDK = ../build/sm-1.11
 # SRCDS_BASE = ~/srcds
 # MMSOURCE17 = ../../../mmsource-central
-MMSOURCE17 = ./mm-1.11
+MMSOURCE17 = ../build/mm-1.11
 
 #####################################
 ### EDIT BELOW FOR OTHER PROJECTS ###
@@ -29,8 +29,8 @@ OBJECTS = \
 ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ###
 ##############################################
 
-C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing
-C_DEBUG_FLAGS = -D_DEBUG -DDEBUG -g -ggdb3
+C_OPT_FLAGS = -DNDEBUG -O3 -funroll-loops -pipe -fno-strict-aliasing -g -ggdb
+C_DEBUG_FLAGS = -D_DEBUG -DDEBUG
 C_GCC4_FLAGS = -fvisibility=hidden
 CPP_GCC4_FLAGS = -fvisibility-inlines-hidden
 CPP = gcc

diff --git a/curl/curl.h → extension/curl/curl.h b/curl/curl.h → extension/curl/curl.h
diff --git a/curl/curlbuild.h → extension/curl/curlbuild.h b/curl/curlbuild.h → extension/curl/curlbuild.h
diff --git a/curl/curlrules.h → extension/curl/curlrules.h b/curl/curlrules.h → extension/curl/curlrules.h
diff --git a/curl/curlver.h → extension/curl/curlver.h b/curl/curlver.h → extension/curl/curlver.h
diff --git a/curl/easy.h → extension/curl/easy.h b/curl/easy.h → extension/curl/easy.h
diff --git a/curl/mprintf.h → extension/curl/mprintf.h b/curl/mprintf.h → extension/curl/mprintf.h
diff --git a/curl/multi.h → extension/curl/multi.h b/curl/multi.h → extension/curl/multi.h
diff --git a/curl/stdcheaders.h → extension/curl/stdcheaders.h b/curl/stdcheaders.h → extension/curl/stdcheaders.h
diff --git a/curl/typecheck-gcc.h → extension/curl/typecheck-gcc.h b/curl/typecheck-gcc.h → extension/curl/typecheck-gcc.h
diff --git a/curlmanager.cpp → extension/curlmanager.cpp b/curlmanager.cpp → extension/curlmanager.cpp
diff --git a/curlmanager.h → extension/curlmanager.h b/curlmanager.h → extension/curlmanager.h
diff --git a/curlthread.cpp → extension/curlthread.cpp b/curlthread.cpp → extension/curlthread.cpp
diff --git a/curlthread.h → extension/curlthread.h b/curlthread.h → extension/curlthread.h
diff --git a/define.h → extension/define.h b/define.h → extension/define.h
diff --git a/extension.cpp → extension/extension.cpp b/extension.cpp → extension/extension.cpp
diff --git a/extension.h → extension/extension.h b/extension.h → extension/extension.h
diff --git a/lib/libbrotlicommon-static.a → extension/lib/libbrotlicommon-static.a b/lib/libbrotlicommon-static.a → extension/lib/libbrotlicommon-static.a
diff --git a/lib/libbrotlidec-static.a → extension/lib/libbrotlidec-static.a b/lib/libbrotlidec-static.a → extension/lib/libbrotlidec-static.a
diff --git a/lib/libbrotlienc-static.a → extension/lib/libbrotlienc-static.a b/lib/libbrotlienc-static.a → extension/lib/libbrotlienc-static.a
diff --git a/lib/libcrypto.a → extension/lib/libcrypto.a b/lib/libcrypto.a → extension/lib/libcrypto.a
diff --git a/lib/libcurl.a → extension/lib/libcurl.a b/lib/libcurl.a → extension/lib/libcurl.a
diff --git a/lib/libcurl.dll.a → extension/lib/libcurl.dll.a b/lib/libcurl.dll.a → extension/lib/libcurl.dll.a
diff --git a/lib/libcurl.lib → extension/lib/libcurl.lib b/lib/libcurl.lib → extension/lib/libcurl.lib
diff --git a/lib/libcurld.lib → extension/lib/libcurld.lib b/lib/libcurld.lib → extension/lib/libcurld.lib
diff --git a/lib/libcurld.lib_unusable → extension/lib/libcurld.lib_unusable b/lib/libcurld.lib_unusable → extension/lib/libcurld.lib_unusable
diff --git a/lib/libgsasl.a → extension/lib/libgsasl.a b/lib/libgsasl.a → extension/lib/libgsasl.a
diff --git a/lib/libnghttp2.a → extension/lib/libnghttp2.a b/lib/libnghttp2.a → extension/lib/libnghttp2.a
diff --git a/lib/libngtcp2.a → extension/lib/libngtcp2.a b/lib/libngtcp2.a → extension/lib/libngtcp2.a
diff --git a/lib/libssh2.a → extension/lib/libssh2.a b/lib/libssh2.a → extension/lib/libssh2.a
diff --git a/lib/libssl.a → extension/lib/libssl.a b/lib/libssl.a → extension/lib/libssl.a
diff --git a/lib/libz.a → extension/lib/libz.a b/lib/libz.a → extension/lib/libz.a
diff --git a/lib/libzstd.a → extension/lib/libzstd.a b/lib/libzstd.a → extension/lib/libzstd.a
diff --git a/natives.cpp → extension/natives.cpp b/natives.cpp → extension/natives.cpp
@@ -520,6 +520,16 @@ static cell_t sm_curl_hash_file(IPluginContext *pContext, const cell_t *params)
 
 static cell_t sm_curl_hash_string(IPluginContext *pContext, const cell_t *params)
 {
+	Openssl_Hash hashType = (Openssl_Hash)params[3];
+	if
+	(
+		   hashType == Openssl_Hash_MD2
+		|| hashType == Openssl_Hash_SHA
+	)
+	{
+		return pContext->ThrowNativeError("Deprecated hash function %x - Sorry!", params[3]);
+	}
+
 	char *input;
 	unsigned int data_size = (unsigned int)params[2];
 	if(data_size > 0)

diff --git a/openssl/__DECC_INCLUDE_EPILOGUE.H → extension/openssl/__DECC_INCLUDE_EPILOGUE.H b/openssl/__DECC_INCLUDE_EPILOGUE.H → extension/openssl/__DECC_INCLUDE_EPILOGUE.H
diff --git a/openssl/__DECC_INCLUDE_PROLOGUE.H → extension/openssl/__DECC_INCLUDE_PROLOGUE.H b/openssl/__DECC_INCLUDE_PROLOGUE.H → extension/openssl/__DECC_INCLUDE_PROLOGUE.H
diff --git a/openssl/aes.h → extension/openssl/aes.h b/openssl/aes.h → extension/openssl/aes.h
diff --git a/openssl/asn1.h → extension/openssl/asn1.h b/openssl/asn1.h → extension/openssl/asn1.h
diff --git a/openssl/asn1.h.in → extension/openssl/asn1.h.in b/openssl/asn1.h.in → extension/openssl/asn1.h.in
diff --git a/openssl/asn1_mac.h → extension/openssl/asn1_mac.h b/openssl/asn1_mac.h → extension/openssl/asn1_mac.h
diff --git a/openssl/asn1err.h → extension/openssl/asn1err.h b/openssl/asn1err.h → extension/openssl/asn1err.h
diff --git a/openssl/asn1t.h → extension/openssl/asn1t.h b/openssl/asn1t.h → extension/openssl/asn1t.h
diff --git a/openssl/asn1t.h.in → extension/openssl/asn1t.h.in b/openssl/asn1t.h.in → extension/openssl/asn1t.h.in
diff --git a/openssl/async.h → extension/openssl/async.h b/openssl/async.h → extension/openssl/async.h
diff --git a/openssl/asyncerr.h → extension/openssl/asyncerr.h b/openssl/asyncerr.h → extension/openssl/asyncerr.h
diff --git a/openssl/bio.h → extension/openssl/bio.h b/openssl/bio.h → extension/openssl/bio.h
diff --git a/openssl/bio.h.in → extension/openssl/bio.h.in b/openssl/bio.h.in → extension/openssl/bio.h.in
diff --git a/openssl/bioerr.h → extension/openssl/bioerr.h b/openssl/bioerr.h → extension/openssl/bioerr.h
diff --git a/openssl/blowfish.h → extension/openssl/blowfish.h b/openssl/blowfish.h → extension/openssl/blowfish.h
diff --git a/openssl/bn.h → extension/openssl/bn.h b/openssl/bn.h → extension/openssl/bn.h
diff --git a/openssl/bnerr.h → extension/openssl/bnerr.h b/openssl/bnerr.h → extension/openssl/bnerr.h
diff --git a/openssl/buffer.h → extension/openssl/buffer.h b/openssl/buffer.h → extension/openssl/buffer.h
diff --git a/openssl/buffererr.h → extension/openssl/buffererr.h b/openssl/buffererr.h → extension/openssl/buffererr.h
diff --git a/openssl/camellia.h → extension/openssl/camellia.h b/openssl/camellia.h → extension/openssl/camellia.h
diff --git a/openssl/cast.h → extension/openssl/cast.h b/openssl/cast.h → extension/openssl/cast.h
diff --git a/openssl/cmac.h → extension/openssl/cmac.h b/openssl/cmac.h → extension/openssl/cmac.h
diff --git a/openssl/cmp.h → extension/openssl/cmp.h b/openssl/cmp.h → extension/openssl/cmp.h
diff --git a/openssl/cmp.h.in → extension/openssl/cmp.h.in b/openssl/cmp.h.in → extension/openssl/cmp.h.in
diff --git a/openssl/cmp_util.h → extension/openssl/cmp_util.h b/openssl/cmp_util.h → extension/openssl/cmp_util.h
diff --git a/openssl/cmperr.h → extension/openssl/cmperr.h b/openssl/cmperr.h → extension/openssl/cmperr.h
diff --git a/openssl/cms.h → extension/openssl/cms.h b/openssl/cms.h → extension/openssl/cms.h
diff --git a/openssl/cms.h.in → extension/openssl/cms.h.in b/openssl/cms.h.in → extension/openssl/cms.h.in
diff --git a/openssl/cmserr.h → extension/openssl/cmserr.h b/openssl/cmserr.h → extension/openssl/cmserr.h
diff --git a/openssl/comp.h → extension/openssl/comp.h b/openssl/comp.h → extension/openssl/comp.h
diff --git a/openssl/comperr.h → extension/openssl/comperr.h b/openssl/comperr.h → extension/openssl/comperr.h
diff --git a/openssl/conf.h → extension/openssl/conf.h b/openssl/conf.h → extension/openssl/conf.h
diff --git a/openssl/conf.h.in → extension/openssl/conf.h.in b/openssl/conf.h.in → extension/openssl/conf.h.in
diff --git a/openssl/conf_api.h → extension/openssl/conf_api.h b/openssl/conf_api.h → extension/openssl/conf_api.h
diff --git a/openssl/conferr.h → extension/openssl/conferr.h b/openssl/conferr.h → extension/openssl/conferr.h
diff --git a/openssl/configuration.h → extension/openssl/configuration.h b/openssl/configuration.h → extension/openssl/configuration.h
diff --git a/openssl/configuration.h.in → extension/openssl/configuration.h.in b/openssl/configuration.h.in → extension/openssl/configuration.h.in
diff --git a/openssl/conftypes.h → extension/openssl/conftypes.h b/openssl/conftypes.h → extension/openssl/conftypes.h
diff --git a/openssl/core.h → extension/openssl/core.h b/openssl/core.h → extension/openssl/core.h
diff --git a/openssl/core_dispatch.h → extension/openssl/core_dispatch.h b/openssl/core_dispatch.h → extension/openssl/core_dispatch.h
diff --git a/openssl/core_names.h → extension/openssl/core_names.h b/openssl/core_names.h → extension/openssl/core_names.h
diff --git a/openssl/core_object.h → extension/openssl/core_object.h b/openssl/core_object.h → extension/openssl/core_object.h
diff --git a/openssl/crmf.h → extension/openssl/crmf.h b/openssl/crmf.h → extension/openssl/crmf.h
diff --git a/openssl/crmf.h.in → extension/openssl/crmf.h.in b/openssl/crmf.h.in → extension/openssl/crmf.h.in
diff --git a/openssl/crmferr.h → extension/openssl/crmferr.h b/openssl/crmferr.h → extension/openssl/crmferr.h
diff --git a/openssl/crypto.h → extension/openssl/crypto.h b/openssl/crypto.h → extension/openssl/crypto.h
diff --git a/openssl/crypto.h.in → extension/openssl/crypto.h.in b/openssl/crypto.h.in → extension/openssl/crypto.h.in
diff --git a/openssl/cryptoerr.h → extension/openssl/cryptoerr.h b/openssl/cryptoerr.h → extension/openssl/cryptoerr.h
diff --git a/openssl/cryptoerr_legacy.h → extension/openssl/cryptoerr_legacy.h b/openssl/cryptoerr_legacy.h → extension/openssl/cryptoerr_legacy.h
diff --git a/openssl/ct.h → extension/openssl/ct.h b/openssl/ct.h → extension/openssl/ct.h
diff --git a/openssl/ct.h.in → extension/openssl/ct.h.in b/openssl/ct.h.in → extension/openssl/ct.h.in
diff --git a/openssl/cterr.h → extension/openssl/cterr.h b/openssl/cterr.h → extension/openssl/cterr.h
diff --git a/openssl/decoder.h → extension/openssl/decoder.h b/openssl/decoder.h → extension/openssl/decoder.h
diff --git a/openssl/decodererr.h → extension/openssl/decodererr.h b/openssl/decodererr.h → extension/openssl/decodererr.h
diff --git a/openssl/des.h → extension/openssl/des.h b/openssl/des.h → extension/openssl/des.h
diff --git a/openssl/dh.h → extension/openssl/dh.h b/openssl/dh.h → extension/openssl/dh.h
diff --git a/openssl/dherr.h → extension/openssl/dherr.h b/openssl/dherr.h → extension/openssl/dherr.h
diff --git a/openssl/dsa.h → extension/openssl/dsa.h b/openssl/dsa.h → extension/openssl/dsa.h
diff --git a/openssl/dsaerr.h → extension/openssl/dsaerr.h b/openssl/dsaerr.h → extension/openssl/dsaerr.h
diff --git a/openssl/dtls1.h → extension/openssl/dtls1.h b/openssl/dtls1.h → extension/openssl/dtls1.h
diff --git a/openssl/e_os2.h → extension/openssl/e_os2.h b/openssl/e_os2.h → extension/openssl/e_os2.h
diff --git a/openssl/ebcdic.h → extension/openssl/ebcdic.h b/openssl/ebcdic.h → extension/openssl/ebcdic.h
diff --git a/openssl/ec.h → extension/openssl/ec.h b/openssl/ec.h → extension/openssl/ec.h
diff --git a/openssl/ecdh.h → extension/openssl/ecdh.h b/openssl/ecdh.h → extension/openssl/ecdh.h
diff --git a/openssl/ecdsa.h → extension/openssl/ecdsa.h b/openssl/ecdsa.h → extension/openssl/ecdsa.h
diff --git a/openssl/ecerr.h → extension/openssl/ecerr.h b/openssl/ecerr.h → extension/openssl/ecerr.h
diff --git a/openssl/encoder.h → extension/openssl/encoder.h b/openssl/encoder.h → extension/openssl/encoder.h
diff --git a/openssl/encodererr.h → extension/openssl/encodererr.h b/openssl/encodererr.h → extension/openssl/encodererr.h
diff --git a/openssl/engine.h → extension/openssl/engine.h b/openssl/engine.h → extension/openssl/engine.h
diff --git a/openssl/engineerr.h → extension/openssl/engineerr.h b/openssl/engineerr.h → extension/openssl/engineerr.h
diff --git a/openssl/err.h → extension/openssl/err.h b/openssl/err.h → extension/openssl/err.h
diff --git a/openssl/err.h.in → extension/openssl/err.h.in b/openssl/err.h.in → extension/openssl/err.h.in
diff --git a/openssl/ess.h → extension/openssl/ess.h b/openssl/ess.h → extension/openssl/ess.h
diff --git a/openssl/ess.h.in → extension/openssl/ess.h.in b/openssl/ess.h.in → extension/openssl/ess.h.in
diff --git a/openssl/esserr.h → extension/openssl/esserr.h b/openssl/esserr.h → extension/openssl/esserr.h
diff --git a/openssl/evp.h → extension/openssl/evp.h b/openssl/evp.h → extension/openssl/evp.h
diff --git a/openssl/evperr.h → extension/openssl/evperr.h b/openssl/evperr.h → extension/openssl/evperr.h
diff --git a/openssl/fips_names.h → extension/openssl/fips_names.h b/openssl/fips_names.h → extension/openssl/fips_names.h
diff --git a/openssl/fipskey.h → extension/openssl/fipskey.h b/openssl/fipskey.h → extension/openssl/fipskey.h
diff --git a/openssl/fipskey.h.in → extension/openssl/fipskey.h.in b/openssl/fipskey.h.in → extension/openssl/fipskey.h.in
diff --git a/openssl/hmac.h → extension/openssl/hmac.h b/openssl/hmac.h → extension/openssl/hmac.h
diff --git a/openssl/http.h → extension/openssl/http.h b/openssl/http.h → extension/openssl/http.h
diff --git a/openssl/httperr.h → extension/openssl/httperr.h b/openssl/httperr.h → extension/openssl/httperr.h
diff --git a/openssl/idea.h → extension/openssl/idea.h b/openssl/idea.h → extension/openssl/idea.h
diff --git a/openssl/kdf.h → extension/openssl/kdf.h b/openssl/kdf.h → extension/openssl/kdf.h
diff --git a/openssl/kdferr.h → extension/openssl/kdferr.h b/openssl/kdferr.h → extension/openssl/kdferr.h
diff --git a/openssl/lhash.h → extension/openssl/lhash.h b/openssl/lhash.h → extension/openssl/lhash.h
diff --git a/openssl/lhash.h.in → extension/openssl/lhash.h.in b/openssl/lhash.h.in → extension/openssl/lhash.h.in
diff --git a/openssl/macros.h → extension/openssl/macros.h b/openssl/macros.h → extension/openssl/macros.h
diff --git a/openssl/md2.h → extension/openssl/md2.h b/openssl/md2.h → extension/openssl/md2.h
diff --git a/openssl/md4.h → extension/openssl/md4.h b/openssl/md4.h → extension/openssl/md4.h
diff --git a/openssl/md5.h → extension/openssl/md5.h b/openssl/md5.h → extension/openssl/md5.h
diff --git a/openssl/mdc2.h → extension/openssl/mdc2.h b/openssl/mdc2.h → extension/openssl/mdc2.h
diff --git a/openssl/modes.h → extension/openssl/modes.h b/openssl/modes.h → extension/openssl/modes.h
diff --git a/openssl/obj_mac.h → extension/openssl/obj_mac.h b/openssl/obj_mac.h → extension/openssl/obj_mac.h
diff --git a/openssl/objects.h → extension/openssl/objects.h b/openssl/objects.h → extension/openssl/objects.h
diff --git a/openssl/objectserr.h → extension/openssl/objectserr.h b/openssl/objectserr.h → extension/openssl/objectserr.h
diff --git a/openssl/ocsp.h → extension/openssl/ocsp.h b/openssl/ocsp.h → extension/openssl/ocsp.h
diff --git a/openssl/ocsp.h.in → extension/openssl/ocsp.h.in b/openssl/ocsp.h.in → extension/openssl/ocsp.h.in
diff --git a/openssl/ocsperr.h → extension/openssl/ocsperr.h b/openssl/ocsperr.h → extension/openssl/ocsperr.h
diff --git a/openssl/opensslconf.h → extension/openssl/opensslconf.h b/openssl/opensslconf.h → extension/openssl/opensslconf.h
diff --git a/openssl/opensslv.h → extension/openssl/opensslv.h b/openssl/opensslv.h → extension/openssl/opensslv.h
diff --git a/openssl/opensslv.h.in → extension/openssl/opensslv.h.in b/openssl/opensslv.h.in → extension/openssl/opensslv.h.in
diff --git a/openssl/ossl_typ.h → extension/openssl/ossl_typ.h b/openssl/ossl_typ.h → extension/openssl/ossl_typ.h
diff --git a/openssl/param_build.h → extension/openssl/param_build.h b/openssl/param_build.h → extension/openssl/param_build.h
diff --git a/openssl/params.h → extension/openssl/params.h b/openssl/params.h → extension/openssl/params.h
diff --git a/openssl/pem.h → extension/openssl/pem.h b/openssl/pem.h → extension/openssl/pem.h
diff --git a/openssl/pem2.h → extension/openssl/pem2.h b/openssl/pem2.h → extension/openssl/pem2.h
diff --git a/openssl/pemerr.h → extension/openssl/pemerr.h b/openssl/pemerr.h → extension/openssl/pemerr.h
diff --git a/openssl/pkcs12.h → extension/openssl/pkcs12.h b/openssl/pkcs12.h → extension/openssl/pkcs12.h
diff --git a/openssl/pkcs12.h.in → extension/openssl/pkcs12.h.in b/openssl/pkcs12.h.in → extension/openssl/pkcs12.h.in
diff --git a/openssl/pkcs12err.h → extension/openssl/pkcs12err.h b/openssl/pkcs12err.h → extension/openssl/pkcs12err.h
diff --git a/openssl/pkcs7.h → extension/openssl/pkcs7.h b/openssl/pkcs7.h → extension/openssl/pkcs7.h
diff --git a/openssl/pkcs7.h.in → extension/openssl/pkcs7.h.in b/openssl/pkcs7.h.in → extension/openssl/pkcs7.h.in
diff --git a/openssl/pkcs7err.h → extension/openssl/pkcs7err.h b/openssl/pkcs7err.h → extension/openssl/pkcs7err.h
diff --git a/openssl/prov_ssl.h → extension/openssl/prov_ssl.h b/openssl/prov_ssl.h → extension/openssl/prov_ssl.h
diff --git a/openssl/proverr.h → extension/openssl/proverr.h b/openssl/proverr.h → extension/openssl/proverr.h
diff --git a/openssl/provider.h → extension/openssl/provider.h b/openssl/provider.h → extension/openssl/provider.h
diff --git a/openssl/rand.h → extension/openssl/rand.h b/openssl/rand.h → extension/openssl/rand.h
diff --git a/openssl/randerr.h → extension/openssl/randerr.h b/openssl/randerr.h → extension/openssl/randerr.h
diff --git a/openssl/rc2.h → extension/openssl/rc2.h b/openssl/rc2.h → extension/openssl/rc2.h
diff --git a/openssl/rc4.h → extension/openssl/rc4.h b/openssl/rc4.h → extension/openssl/rc4.h
diff --git a/openssl/rc5.h → extension/openssl/rc5.h b/openssl/rc5.h → extension/openssl/rc5.h
diff --git a/openssl/ripemd.h → extension/openssl/ripemd.h b/openssl/ripemd.h → extension/openssl/ripemd.h
diff --git a/openssl/rsa.h → extension/openssl/rsa.h b/openssl/rsa.h → extension/openssl/rsa.h
diff --git a/openssl/rsaerr.h → extension/openssl/rsaerr.h b/openssl/rsaerr.h → extension/openssl/rsaerr.h
diff --git a/openssl/safestack.h → extension/openssl/safestack.h b/openssl/safestack.h → extension/openssl/safestack.h
diff --git a/openssl/safestack.h.in → extension/openssl/safestack.h.in b/openssl/safestack.h.in → extension/openssl/safestack.h.in
diff --git a/openssl/seed.h → extension/openssl/seed.h b/openssl/seed.h → extension/openssl/seed.h
diff --git a/openssl/self_test.h → extension/openssl/self_test.h b/openssl/self_test.h → extension/openssl/self_test.h
diff --git a/openssl/sha.h → extension/openssl/sha.h b/openssl/sha.h → extension/openssl/sha.h
diff --git a/openssl/srp.h → extension/openssl/srp.h b/openssl/srp.h → extension/openssl/srp.h
diff --git a/openssl/srp.h.in → extension/openssl/srp.h.in b/openssl/srp.h.in → extension/openssl/srp.h.in
diff --git a/openssl/srtp.h → extension/openssl/srtp.h b/openssl/srtp.h → extension/openssl/srtp.h
diff --git a/openssl/ssl.h → extension/openssl/ssl.h b/openssl/ssl.h → extension/openssl/ssl.h
diff --git a/openssl/ssl.h.in → extension/openssl/ssl.h.in b/openssl/ssl.h.in → extension/openssl/ssl.h.in
diff --git a/openssl/ssl2.h → extension/openssl/ssl2.h b/openssl/ssl2.h → extension/openssl/ssl2.h
diff --git a/openssl/ssl3.h → extension/openssl/ssl3.h b/openssl/ssl3.h → extension/openssl/ssl3.h
diff --git a/openssl/sslerr.h → extension/openssl/sslerr.h b/openssl/sslerr.h → extension/openssl/sslerr.h
diff --git a/openssl/sslerr_legacy.h → extension/openssl/sslerr_legacy.h b/openssl/sslerr_legacy.h → extension/openssl/sslerr_legacy.h
diff --git a/openssl/stack.h → extension/openssl/stack.h b/openssl/stack.h → extension/openssl/stack.h
diff --git a/openssl/store.h → extension/openssl/store.h b/openssl/store.h → extension/openssl/store.h
diff --git a/openssl/storeerr.h → extension/openssl/storeerr.h b/openssl/storeerr.h → extension/openssl/storeerr.h
diff --git a/openssl/symhacks.h → extension/openssl/symhacks.h b/openssl/symhacks.h → extension/openssl/symhacks.h
diff --git a/openssl/tls1.h → extension/openssl/tls1.h b/openssl/tls1.h → extension/openssl/tls1.h
diff --git a/openssl/trace.h → extension/openssl/trace.h b/openssl/trace.h → extension/openssl/trace.h
diff --git a/openssl/ts.h → extension/openssl/ts.h b/openssl/ts.h → extension/openssl/ts.h
diff --git a/openssl/tserr.h → extension/openssl/tserr.h b/openssl/tserr.h → extension/openssl/tserr.h
diff --git a/openssl/txt_db.h → extension/openssl/txt_db.h b/openssl/txt_db.h → extension/openssl/txt_db.h
diff --git a/openssl/types.h → extension/openssl/types.h b/openssl/types.h → extension/openssl/types.h
diff --git a/openssl/ui.h → extension/openssl/ui.h b/openssl/ui.h → extension/openssl/ui.h
diff --git a/openssl/ui.h.in → extension/openssl/ui.h.in b/openssl/ui.h.in → extension/openssl/ui.h.in
diff --git a/openssl/uierr.h → extension/openssl/uierr.h b/openssl/uierr.h → extension/openssl/uierr.h
diff --git a/openssl/whrlpool.h → extension/openssl/whrlpool.h b/openssl/whrlpool.h → extension/openssl/whrlpool.h
diff --git a/openssl/x509.h → extension/openssl/x509.h b/openssl/x509.h → extension/openssl/x509.h
diff --git a/openssl/x509.h.in → extension/openssl/x509.h.in b/openssl/x509.h.in → extension/openssl/x509.h.in
diff --git a/openssl/x509_vfy.h → extension/openssl/x509_vfy.h b/openssl/x509_vfy.h → extension/openssl/x509_vfy.h
diff --git a/openssl/x509_vfy.h.in → extension/openssl/x509_vfy.h.in b/openssl/x509_vfy.h.in → extension/openssl/x509_vfy.h.in
diff --git a/openssl/x509err.h → extension/openssl/x509err.h b/openssl/x509err.h → extension/openssl/x509err.h
diff --git a/openssl/x509v3.h → extension/openssl/x509v3.h b/openssl/x509v3.h → extension/openssl/x509v3.h
diff --git a/openssl/x509v3.h.in → extension/openssl/x509v3.h.in b/openssl/x509v3.h.in → extension/openssl/x509v3.h.in
diff --git a/openssl/x509v3err.h → extension/openssl/x509v3err.h b/openssl/x509v3err.h → extension/openssl/x509v3err.h
diff --git a/opensslmanager.cpp → extension/opensslmanager.cpp b/opensslmanager.cpp → extension/opensslmanager.cpp
@@ -6,10 +6,13 @@
 #include <openssl/sha.h>
 #include <openssl/ripemd.h>
 
+// NEED to convert this to using EVP one of these days...
+// https://www.openssl.org/docs/manmaster/man3/EVP_DigestInit.html
+// -sappho
 
 #define	MD5_FILE_BUFFER_SIZE		1024*16
 #define	MD4_FILE_BUFFER_SIZE		1024*16
-//#define	MD2_FILE_BUFFER_SIZE		1024*16
+// #define MD2_FILE_BUFFER_SIZE		1024*16
 // #define SHA_FILE_BUFFER_SIZE		1024*16
 #define SHA1_FILE_BUFFER_SIZE		1024*16
 #define SHA224_FILE_BUFFER_SIZE		1024*16
@@ -283,12 +286,14 @@ bool OpensslManager::HashFile(Openssl_Hash algorithm, FILE *pFile, unsigned char
 		case Openssl_Hash_MD4:
 			MD4_File(pFile, output, outlength);
 			return true;
-		//case Openssl_Hash_MD2:
-		//	MD2_File(pFile, output, outlength);
-		//	return true;
-		//case Openssl_Hash_SHA:
-		//	SHA_File(pFile, output, outlength);
-		//	return true;
+		case Openssl_Hash_MD2:
+			//MD2_File(pFile, output, outlength);
+			//return true;
+			return false;
+		case Openssl_Hash_SHA:
+			//SHA_File(pFile, output, outlength);
+			//return true;
+			return false;
 		case Openssl_Hash_SHA1:
 			SHA1_File(pFile, output, outlength);
 			return true;
@@ -329,10 +334,12 @@ bool OpensslManager::HashString(Openssl_Hash algorithm, unsigned char *input, in
 		//	MD2(input, size, output);
 		//	*outlength = MD2_DIGEST_LENGTH;
 		//	return true;
+			return false;
 		//case Openssl_Hash_SHA:
 		//	SHA(input, size, output);
 		//	*outlength = SHA_DIGEST_LENGTH;
 		//	return true;
+			return false;
 		case Openssl_Hash_SHA1:
 			SHA1(input, size, output);
 			*outlength = SHA_DIGEST_LENGTH;

diff --git a/opensslmanager.h → extension/opensslmanager.h b/opensslmanager.h → extension/opensslmanager.h
diff --git a/opensslthread.cpp → extension/opensslthread.cpp b/opensslthread.cpp → extension/opensslthread.cpp
diff --git a/opensslthread.h → extension/opensslthread.h b/opensslthread.h → extension/opensslthread.h
diff --git a/sdk/smsdk_config.h → extension/sdk/smsdk_config.h b/sdk/smsdk_config.h → extension/sdk/smsdk_config.h
@@ -38,12 +38,12 @@
  */
 
 /* Basic information exposed publicly */
-#define SMEXT_CONF_NAME			"cURL Extension"
-#define SMEXT_CONF_DESCRIPTION	"cURL Extension"
-#define SMEXT_CONF_VERSION		"1.3.0.0"
-#define SMEXT_CONF_AUTHOR		"ben"
-#define SMEXT_CONF_URL			"http://www.ZombieX2.net/"
-#define SMEXT_CONF_LOGTAG		"cURL"
+#define SMEXT_CONF_NAME			"NEO cURL Extension"
+#define SMEXT_CONF_DESCRIPTION	"NEO cURL Extension"
+#define SMEXT_CONF_VERSION		"2.0.0.0"
+#define SMEXT_CONF_AUTHOR		"https://sappho.io - formerly ben"
+#define SMEXT_CONF_URL			"https://sappho.io - formerly maintained by http://www.ZombieX2.net/"
+#define SMEXT_CONF_LOGTAG		"NEO cURL"
 #define SMEXT_CONF_LICENSE		"GPL"
 #define SMEXT_CONF_DATESTRING	__DATE__
 

diff --git a/sdk/smsdk_ext.cpp → extension/sdk/smsdk_ext.cpp b/sdk/smsdk_ext.cpp → extension/sdk/smsdk_ext.cpp
diff --git a/sdk/smsdk_ext.h → extension/sdk/smsdk_ext.h b/sdk/smsdk_ext.h → extension/sdk/smsdk_ext.h
diff --git a/extension/test.sh b/extension/test.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+FIX ME
+if ( ! git clone https://github.com/alliedmodders/sourcemod --branch 1.11-dev sm-1.11 --recursive ); then
+	pushd sm-1.11 || echo "COULDNT CD TO SM???"; exit 255
+	echo "test"; pwd;
+	git reset --hard;
+	git fetch
+	git reset --hard FETCH_HEAD
+	git submodule foreach --recursive git reset --hard origin/HEAD
+	pwd
+	popd || echo "COULDNT POPD FROM $(pwd)???"; exit 255;
+	fi;
+fi
diff --git a/scripting/curl_self_test.sp → pawn/scripting/curl_self_test.sp b/scripting/curl_self_test.sp → pawn/scripting/curl_self_test.sp
diff --git a/scripting/include/cURL.inc → pawn/scripting/include/cURL.inc b/scripting/include/cURL.inc → pawn/scripting/include/cURL.inc
diff --git a/scripting/include/cURL_header.inc → pawn/scripting/include/cURL_header.inc b/scripting/include/cURL_header.inc → pawn/scripting/include/cURL_header.inc
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,5 @@ mm-* @@
     test*
     Release/
     Debug/
+    build
+    build/*