diff --git a/Makefile b/Makefile index e09727c..b3dc7f0 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ PROJECT = owls PROJECT_DESCRIPTION = OpenWiFi Load Simulator (OWLS) PROJECT_VERSION = 0.1.0 -DEPS = lager gpb jiffy ranch gun cowlib cowboy rec2json uuid +DEPS = lager gpb jiffy cowlib ranch gun cowboy rec2json uuid ERLC_OPTS += -I deps/gpb/include ERLC_OPTS += +'{parse_transform, lager_transform}' @@ -15,11 +15,15 @@ ERLC_OPTS += -Ddebug # Apps necessary for dialyzer PLT_APPS += ssl os_mon sasl crypto inets eunit syntax_tools public_key mnesia tftp +dep_cowlib_commit = master dep_cowboy_commit = master dep_ranch_commit = master +dep_gun_commit = master include erlang.mk +dep_cowlib_commit = master + # Code necessary to generate the protobufs for mqtt payload $(PROJECT).d:: src/opensync_stats.erl diff --git a/api/owlsapi.yml b/api/owlsapi.yml index 47dc123..3275602 100644 --- a/api/owlsapi.yml +++ b/api/owlsapi.yml @@ -593,6 +593,10 @@ components: description: The certificate for the CA type: string format: byte + Decrypt: + description: The certificate decryption key + type: string + format: byte Password: description: The password for the CA information type: string @@ -621,6 +625,12 @@ components: Name: description: Device identifier type: string + MAC: + description: MAC Address + type: string + Serial: + description: Device serial identifier + type: string Description: description: Device description if available type: string @@ -648,6 +658,10 @@ components: description: Decrypt key type: string format: byte + CSR: + description: Decrypt key + type: string + format: byte Info: $ref: '#/components/schemas/GenericProperties' diff --git a/erlang.mk b/erlang.mk index bb5f409..ba40c23 100644 --- a/erlang.mk +++ b/erlang.mk @@ -927,7 +927,7 @@ pkg_cowlib_description = Support library for manipulating Web protocols. pkg_cowlib_homepage = http://ninenines.eu pkg_cowlib_fetch = git pkg_cowlib_repo = https://github.com/ninenines/cowlib -pkg_cowlib_commit = 1.0.2 +pkg_cowlib_commit = master PACKAGES += cpg pkg_cpg_name = cpg