From a1651be096bb3daf2bc33a803b3cf16d42494f19 Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Fri, 20 Sep 2024 15:33:40 +0200 Subject: [PATCH 1/5] unify .gitignore files --- crypto3/.gitignore => .gitignore | 1 + evm-assigner/.gitignore | 636 ------------------------------ parallel-crypto3/.gitignore | 13 - zkevm-framework/.gitignore | 642 ------------------------------- 4 files changed, 1 insertion(+), 1291 deletions(-) rename crypto3/.gitignore => .gitignore (99%) delete mode 100644 evm-assigner/.gitignore delete mode 100644 parallel-crypto3/.gitignore delete mode 100644 zkevm-framework/.gitignore diff --git a/crypto3/.gitignore b/.gitignore similarity index 99% rename from crypto3/.gitignore rename to .gitignore index 3073ba18b0..6cf62bff11 100644 --- a/crypto3/.gitignore +++ b/.gitignore @@ -340,6 +340,7 @@ modules.xml *.ipr ### CMake ### +CMakeLists.txt.user CMakeCache.txt CMakeFiles CMakeScripts diff --git a/evm-assigner/.gitignore b/evm-assigner/.gitignore deleted file mode 100644 index 3a909a59c9..0000000000 --- a/evm-assigner/.gitignore +++ /dev/null @@ -1,636 +0,0 @@ -## Core latex/pdflatex auxiliary files: -*.aux -*.lof -*.log -*.lot -*.fls -*.out -*.toc -*.fmt -*.fot -*.cb -*.cb2 -.*.lb - -## Intermediate documents: -*.dvi -*.xdv -*-converted-to.* -# these rules might exclude image files for figures etc. -# *.ps -# *.eps -# *.pdf - -## Generated if empty string is given at "Please type another file name for output:" -.pdf - -## Bibliography auxiliary files (bibtex/biblatex/biber): -*.bbl -*.bcf -*.blg -*-blx.aux -*-blx.bib -*.run.xml - -## Build tool auxiliary files: -*.fdb_latexmk -*.synctex -*.synctex(busy) -*.synctex.gz -*.synctex.gz(busy) -*.pdfsync - -## Auxiliary and intermediate files from other packages: -# algorithms -*.alg -*.loa - -# achemso -acs-*.bib - -# amsthm -*.thm - -# beamer -*.nav -*.pre -*.snm -*.vrb - -# changes -*.soc - -# cprotect -*.cpt - -# elsarticle (documentclass of Elsevier journals) -*.spl - -# endnotes -*.ent - -# fixme -*.lox - -# feynmf/feynmp -*.mf -*.mp -*.t[1-9] -*.t[1-9][0-9] -*.tfm - -#(r)(e)ledmac/(r)(e)ledpar -*.end -*.?end -*.[1-9] -*.[1-9][0-9] -*.[1-9][0-9][0-9] -*.[1-9]R -*.[1-9][0-9]R -*.[1-9][0-9][0-9]R -*.eledsec[1-9] -*.eledsec[1-9]R -*.eledsec[1-9][0-9] -*.eledsec[1-9][0-9]R -*.eledsec[1-9][0-9][0-9] -*.eledsec[1-9][0-9][0-9]R - -# glossaries -*.acn -*.acr -*.glg -*.glo -*.gls -*.glsdefs - -# gnuplottex -*-gnuplottex-* - -# gregoriotex -*.gaux -*.gtex - -# htlatex -*.4ct -*.4tc -*.idv -*.lg -*.trc -*.xref - -# hyperref -*.brf - -# knitr -*-concordance.tex -# TODO Comment the next line if you want to keep your tikz graphics files -*.tikz -*-tikzDictionary - -# listings -*.lol - -# makeidx -*.idx -*.ilg -*.ind -*.ist - -# minitoc -*.maf -*.mlf -*.mlt -*.mtc[0-9]* -*.slf[0-9]* -*.slt[0-9]* -*.stc[0-9]* - -# minted -_minted* -*.pyg - -# morewrites -*.mw - -# nomencl -*.nlg -*.nlo -*.nls - -# pax -*.pax - -# pdfpcnotes -*.pdfpc - -# sagetex -*.sagetex.sage -*.sagetex.py -*.sagetex.scmd - -# scrwfile -*.wrt - -# sympy -*.sout -*.sympy -sympy-plots-for-*.tex/ - -# pdfcomment -*.upa -*.upb - -# pythontex -*.pytxcode -pythontex-files-*/ - -# thmtools -*.loe - -# TikZ & PGF -*.dpth -*.md5 -*.auxlock - -# todonotes -*.tdo - -# easy-todo -*.lod - -# xmpincl -*.xmpi - -# xindy -*.xdy - -# xypic precompiled matrices -*.xyc - -# endfloat -*.ttt -*.fff - -# Latexian -TSWLatexianTemp* - -## Editors: -# WinEdt -*.bak -*.sav - -# Texpad -.texpadtmp - -# Kile -*.backup - -# KBibTeX -*~[0-9]* - -# auto folder when using emacs and auctex -./auto/* -*.el - -# expex forward references with \gathertags -*-tags.tex - -# standalone packages -*.sta - -### C++ ### -# Prerequisites -*.d - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - -### CLion+all ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/dictionaries - -# Sensitive or high-churn files: -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.xml -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml - -# Gradle: -.idea/**/gradle.xml -.idea/**/libraries - -# CMake -cmake-build-debug/ - -# Mongo Explorer plugin: -.idea/**/mongoSettings.xml - -## File-based project format: -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Ruby plugin and RubyMine -/.rakeTasks - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -### CLion+all Patch ### -# Ignores the whole .idea folder and all .iml files -# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 - -.idea/ - -# Visual Studio Code -.vscode/ - -# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 - -*.iml -modules.xml -.idea/misc.xml -*.ipr - -### CMake ### -CMakeCache.txt -CMakeFiles -CMakeScripts -Testing -Makefile -cmake_install.cmake -install_manifest.txt -compile_commands.json -CTestTestfile.cmake -build - -### LaTeX ### -## Core latex/pdflatex auxiliary files: -*.aux -*.lof -*.log -*.lot -*.fls -*.toc -*.fmt -*.fot -*.cb -*.cb2 - -## Intermediate documents: -*.dvi -*.xdv -*-converted-to.* -# these rules might exclude image files for figures etc. -# *.ps -# *.eps -# *.pdf - -## Generated if empty string is given at "Please type another file name for output:" -.pdf - -## Bibliography auxiliary files (bibtex/biblatex/biber): -*.bbl -*.bcf -*.blg -*-blx.aux -*-blx.bib -*.run.xml - -## Build tool auxiliary files: -*.fdb_latexmk -*.synctex -*.synctex(busy) -*.synctex.gz -*.synctex.gz(busy) -*.pdfsync -*Notes.bib - -## Auxiliary and intermediate files from other packages: -# algorithms -*.alg -*.loa - -# achemso -acs-*.bib - -# amsthm -*.thm - -# beamer -*.nav -*.pre -*.snm -*.vrb - -# changes -*.soc - -# cprotect -*.cpt - -# elsarticle (documentclass of Elsevier journals) -*.spl - -# endnotes -*.ent - -# fixme -*.lox - -# feynmf/feynmp -*.mf -*.mp -*.t[1-9] -*.t[1-9][0-9] -*.tfm - -#(r)(e)ledmac/(r)(e)ledpar -*.end -*.?end -*.[1-9] -*.[1-9][0-9] -*.[1-9][0-9][0-9] -*.[1-9]R -*.[1-9][0-9]R -*.[1-9][0-9][0-9]R -*.eledsec[1-9] -*.eledsec[1-9]R -*.eledsec[1-9][0-9] -*.eledsec[1-9][0-9]R -*.eledsec[1-9][0-9][0-9] -*.eledsec[1-9][0-9][0-9]R - -# glossaries -*.acn -*.acr -*.glg -*.glo -*.gls -*.glsdefs - -# gnuplottex -*-gnuplottex-* - -# gregoriotex -*.gaux -*.gtex - -# hyperref -*.brf - -# knitr -*-concordance.tex -# TODO Comment the next line if you want to keep your tikz graphics files -*.tikz -*-tikzDictionary - -# listings -*.lol - -# makeidx -*.idx -*.ilg -*.ind -*.ist - -# minitoc -*.maf -*.mlf -*.mlt -*.mtc[0-9]* -*.slf[0-9]* -*.slt[0-9]* -*.stc[0-9]* - -# minted -_minted* -*.pyg - -# morewrites -*.mw - -# nomencl -*.nlo - -# pax -*.pax - -# pdfpcnotes -*.pdfpc - -# sagetex -*.sagetex.sage -*.sagetex.py -*.sagetex.scmd - -# scrwfile -*.wrt - -# sympy -*.sout -*.sympy -sympy-plots-for-*.tex/ - -# pdfcomment -*.upa -*.upb - -# pythontex -*.pytxcode -pythontex-files-*/ - -# thmtools -*.loe - -# TikZ & PGF -*.dpth -*.md5 -*.auxlock - -# todonotes -*.tdo - -# easy-todo -*.lod - -# xindy -*.xdy - -# xypic precompiled matrices -*.xyc - -# endfloat -*.ttt -*.fff - -# Latexian -TSWLatexianTemp* - -## Editors: -# WinEdt -*.bak -*.sav - -# Texpad -.texpadtmp - -# Kile -*.backup - -# KBibTeX -*~[0-9]* - -# auto folder when using emacs and auctex -/auto/* - -# expex forward references with \gathertags -*-tags.tex - -### LaTeX Patch ### -# glossaries -*.glstex - - -# Text file backups (e.g. gedit, joe) -*~ -\#*\# -.\#* - -# Archive files -*.tgz -*.tar - -# Logs -*.log - -# Cache and temporary files -*.pyc -.DS_Store -*.swp - -# ctags/etags files -/TAGS -/tags - -# Coverage output -coverage.info -coverage.info.raw -coverage/ -lcov-out/ - -/fuzzer_corpus - -# Profiler outputs -cachegrind.* -callgrind.* - -# Ignore stuff in the top level dir that shouldn't be checked in -/*.c -/*.cpp -/*.h -/*.key -/*.pem -/*.der -/*.ber -/*.gpg -/*.pub -/*.crt - -.ycm_extra_config.py -.color_coded - -# We don't want to commit Cargo.lock for examples -examples/rust/Cargo.lock - -# direnv -.direnv/ - -# Nix build results directory -/result diff --git a/parallel-crypto3/.gitignore b/parallel-crypto3/.gitignore deleted file mode 100644 index acc6efe15a..0000000000 --- a/parallel-crypto3/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -CMakeLists.txt.user -CMakeCache.txt -CMakeFiles -CMakeScripts -Testing -Makefile -cmake_install.cmake -install_manifest.txt -compile_commands.json -CTestTestfile.cmake -_deps -.cache -build diff --git a/zkevm-framework/.gitignore b/zkevm-framework/.gitignore deleted file mode 100644 index 0b34f8c185..0000000000 --- a/zkevm-framework/.gitignore +++ /dev/null @@ -1,642 +0,0 @@ -## Circifier, Assigner and Transpiler generated files: -/*.crct -/*.tbl -/*.bin -/*.sol - -## Core latex/pdflatex auxiliary files: -*.aux -*.lof -*.log -*.lot -*.fls -*.out -*.toc -*.fmt -*.fot -*.cb -*.cb2 -.*.lb - -## Intermediate documents: -*.dvi -*.xdv -*-converted-to.* -# these rules might exclude image files for figures etc. -# *.ps -# *.eps -# *.pdf - -## Generated if empty string is given at "Please type another file name for output:" -.pdf - -## Bibliography auxiliary files (bibtex/biblatex/biber): -*.bbl -*.bcf -*.blg -*-blx.aux -*-blx.bib -*.run.xml - -## Build tool auxiliary files: -*.fdb_latexmk -*.synctex -*.synctex(busy) -*.synctex.gz -*.synctex.gz(busy) -*.pdfsync - -## Auxiliary and intermediate files from other packages: -# algorithms -*.alg -*.loa - -# achemso -acs-*.bib - -# amsthm -*.thm - -# beamer -*.nav -*.pre -*.snm -*.vrb - -# changes -*.soc - -# cprotect -*.cpt - -# elsarticle (documentclass of Elsevier journals) -*.spl - -# endnotes -*.ent - -# fixme -*.lox - -# feynmf/feynmp -*.mf -*.mp -*.t[1-9] -*.t[1-9][0-9] -*.tfm - -#(r)(e)ledmac/(r)(e)ledpar -*.end -*.?end -*.[1-9] -*.[1-9][0-9] -*.[1-9][0-9][0-9] -*.[1-9]R -*.[1-9][0-9]R -*.[1-9][0-9][0-9]R -*.eledsec[1-9] -*.eledsec[1-9]R -*.eledsec[1-9][0-9] -*.eledsec[1-9][0-9]R -*.eledsec[1-9][0-9][0-9] -*.eledsec[1-9][0-9][0-9]R - -# glossaries -*.acn -*.acr -*.glg -*.glo -*.gls -*.glsdefs - -# gnuplottex -*-gnuplottex-* - -# gregoriotex -*.gaux -*.gtex - -# htlatex -*.4ct -*.4tc -*.idv -*.lg -*.trc -*.xref - -# hyperref -*.brf - -# knitr -*-concordance.tex -# TODO Comment the next line if you want to keep your tikz graphics files -*.tikz -*-tikzDictionary - -# listings -*.lol - -# makeidx -*.idx -*.ilg -*.ind -*.ist - -# minitoc -*.maf -*.mlf -*.mlt -*.mtc[0-9]* -*.slf[0-9]* -*.slt[0-9]* -*.stc[0-9]* - -# minted -_minted* -*.pyg - -# morewrites -*.mw - -# nomencl -*.nlg -*.nlo -*.nls - -# pax -*.pax - -# pdfpcnotes -*.pdfpc - -# sagetex -*.sagetex.sage -*.sagetex.py -*.sagetex.scmd - -# scrwfile -*.wrt - -# sympy -*.sout -*.sympy -sympy-plots-for-*.tex/ - -# pdfcomment -*.upa -*.upb - -# pythontex -*.pytxcode -pythontex-files-*/ - -# thmtools -*.loe - -# TikZ & PGF -*.dpth -*.md5 -*.auxlock - -# todonotes -*.tdo - -# easy-todo -*.lod - -# xmpincl -*.xmpi - -# xindy -*.xdy - -# xypic precompiled matrices -*.xyc - -# endfloat -*.ttt -*.fff - -# Latexian -TSWLatexianTemp* - -## Editors: -# WinEdt -*.bak -*.sav - -# Texpad -.texpadtmp - -# Kile -*.backup - -# KBibTeX -*~[0-9]* - -# auto folder when using emacs and auctex -./auto/* -*.el - -# expex forward references with \gathertags -*-tags.tex - -# standalone packages -*.sta - -### C++ ### -# Prerequisites -*.d - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - -### CLion+all ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff: -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/dictionaries - -# Sensitive or high-churn files: -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.xml -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml - -# Gradle: -.idea/**/gradle.xml -.idea/**/libraries - -# CMake -cmake-build-debug/ - -# Mongo Explorer plugin: -.idea/**/mongoSettings.xml - -## File-based project format: -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# Ruby plugin and RubyMine -/.rakeTasks - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -### CLion+all Patch ### -# Ignores the whole .idea folder and all .iml files -# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360 - -.idea/ - -# Visual Studio Code -.vscode/ - -# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023 - -*.iml -modules.xml -.idea/misc.xml -*.ipr - -### CMake ### -CMakeCache.txt -CMakeFiles -CMakeScripts -Testing -Makefile -cmake_install.cmake -install_manifest.txt -compile_commands.json -CTestTestfile.cmake -build - -### LaTeX ### -## Core latex/pdflatex auxiliary files: -*.aux -*.lof -*.log -*.lot -*.fls -*.toc -*.fmt -*.fot -*.cb -*.cb2 - -## Intermediate documents: -*.dvi -*.xdv -*-converted-to.* -# these rules might exclude image files for figures etc. -# *.ps -# *.eps -# *.pdf - -## Generated if empty string is given at "Please type another file name for output:" -.pdf - -## Bibliography auxiliary files (bibtex/biblatex/biber): -*.bbl -*.bcf -*.blg -*-blx.aux -*-blx.bib -*.run.xml - -## Build tool auxiliary files: -*.fdb_latexmk -*.synctex -*.synctex(busy) -*.synctex.gz -*.synctex.gz(busy) -*.pdfsync -*Notes.bib - -## Auxiliary and intermediate files from other packages: -# algorithms -*.alg -*.loa - -# achemso -acs-*.bib - -# amsthm -*.thm - -# beamer -*.nav -*.pre -*.snm -*.vrb - -# changes -*.soc - -# cprotect -*.cpt - -# elsarticle (documentclass of Elsevier journals) -*.spl - -# endnotes -*.ent - -# fixme -*.lox - -# feynmf/feynmp -*.mf -*.mp -*.t[1-9] -*.t[1-9][0-9] -*.tfm - -#(r)(e)ledmac/(r)(e)ledpar -*.end -*.?end -*.[1-9] -*.[1-9][0-9] -*.[1-9][0-9][0-9] -*.[1-9]R -*.[1-9][0-9]R -*.[1-9][0-9][0-9]R -*.eledsec[1-9] -*.eledsec[1-9]R -*.eledsec[1-9][0-9] -*.eledsec[1-9][0-9]R -*.eledsec[1-9][0-9][0-9] -*.eledsec[1-9][0-9][0-9]R - -# glossaries -*.acn -*.acr -*.glg -*.glo -*.gls -*.glsdefs - -# gnuplottex -*-gnuplottex-* - -# gregoriotex -*.gaux -*.gtex - -# hyperref -*.brf - -# knitr -*-concordance.tex -# TODO Comment the next line if you want to keep your tikz graphics files -*.tikz -*-tikzDictionary - -# listings -*.lol - -# makeidx -*.idx -*.ilg -*.ind -*.ist - -# minitoc -*.maf -*.mlf -*.mlt -*.mtc[0-9]* -*.slf[0-9]* -*.slt[0-9]* -*.stc[0-9]* - -# minted -_minted* -*.pyg - -# morewrites -*.mw - -# nomencl -*.nlo - -# pax -*.pax - -# pdfpcnotes -*.pdfpc - -# sagetex -*.sagetex.sage -*.sagetex.py -*.sagetex.scmd - -# scrwfile -*.wrt - -# sympy -*.sout -*.sympy -sympy-plots-for-*.tex/ - -# pdfcomment -*.upa -*.upb - -# pythontex -*.pytxcode -pythontex-files-*/ - -# thmtools -*.loe - -# TikZ & PGF -*.dpth -*.md5 -*.auxlock - -# todonotes -*.tdo - -# easy-todo -*.lod - -# xindy -*.xdy - -# xypic precompiled matrices -*.xyc - -# endfloat -*.ttt -*.fff - -# Latexian -TSWLatexianTemp* - -## Editors: -# WinEdt -*.bak -*.sav - -# Texpad -.texpadtmp - -# Kile -*.backup - -# KBibTeX -*~[0-9]* - -# auto folder when using emacs and auctex -/auto/* - -# expex forward references with \gathertags -*-tags.tex - -### LaTeX Patch ### -# glossaries -*.glstex - - -# Text file backups (e.g. gedit, joe) -*~ -\#*\# -.\#* - -# Archive files -*.tgz -*.tar - -# Logs -*.log - -# Cache and temporary files -*.pyc -.DS_Store -*.swp - -# ctags/etags files -/TAGS -/tags - -# Coverage output -coverage.info -coverage.info.raw -coverage/ -lcov-out/ - -/fuzzer_corpus - -# Profiler outputs -cachegrind.* -callgrind.* - -# Ignore stuff in the top level dir that shouldn't be checked in -/*.c -/*.cpp -/*.h -/*.key -/*.pem -/*.der -/*.ber -/*.gpg -/*.pub -/*.crt - -.ycm_extra_config.py -.color_coded - -# We don't want to commit Cargo.lock for examples -examples/rust/Cargo.lock - -# direnv -.direnv/ - -# Nix build results directory -/result From 351e02ea01ff281350e36bbcf290b2fc192eb30a Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Fri, 20 Sep 2024 16:58:15 +0200 Subject: [PATCH 2/5] remove modules json files --- .../libs/algebra/crypto3.algebra.podspec.json | 54 ----- crypto3/libs/block/crypto3.block.podspec.json | 221 ------------------ crypto3/libs/codec/crypto3.codec.podspec.json | 87 ------- crypto3/libs/hash/crypto3.hash.podspec.json | 161 ------------- crypto3/libs/kdf/crypto3.kdf.podspec.json | 132 ----------- crypto3/libs/mac/crypto3.mac.podspec.json | 117 ---------- crypto3/libs/math/crypto3.math.podspec.json | 87 ------- crypto3/libs/modes/crypto3.modes.podspec.json | 61 ----- .../passhash/crypto3.passhash.podspec.json | 92 -------- crypto3/libs/pbkdf/crypto3.pbkdf.podspec.json | 98 -------- crypto3/libs/pkpad/crypto3.pkpad.podspec.json | 75 ------ .../libs/stream/crypto3.stream.podspec.json | 104 --------- .../threshold/crypto3.threshold.podspec.json | 61 ----- crypto3/libs/vdf/crypto3.vdf.podspec.json | 67 ------ crypto3/libs/zk/crypto3.zk.podspec.json | 87 ------- 15 files changed, 1504 deletions(-) delete mode 100644 crypto3/libs/algebra/crypto3.algebra.podspec.json delete mode 100644 crypto3/libs/block/crypto3.block.podspec.json delete mode 100644 crypto3/libs/codec/crypto3.codec.podspec.json delete mode 100644 crypto3/libs/hash/crypto3.hash.podspec.json delete mode 100644 crypto3/libs/kdf/crypto3.kdf.podspec.json delete mode 100644 crypto3/libs/mac/crypto3.mac.podspec.json delete mode 100644 crypto3/libs/math/crypto3.math.podspec.json delete mode 100644 crypto3/libs/modes/crypto3.modes.podspec.json delete mode 100644 crypto3/libs/passhash/crypto3.passhash.podspec.json delete mode 100644 crypto3/libs/pbkdf/crypto3.pbkdf.podspec.json delete mode 100644 crypto3/libs/pkpad/crypto3.pkpad.podspec.json delete mode 100644 crypto3/libs/stream/crypto3.stream.podspec.json delete mode 100644 crypto3/libs/threshold/crypto3.threshold.podspec.json delete mode 100644 crypto3/libs/vdf/crypto3.vdf.podspec.json delete mode 100644 crypto3/libs/zk/crypto3.zk.podspec.json diff --git a/crypto3/libs/algebra/crypto3.algebra.podspec.json b/crypto3/libs/algebra/crypto3.algebra.podspec.json deleted file mode 100644 index f45d4d26c1..0000000000 --- a/crypto3/libs/algebra/crypto3.algebra.podspec.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "name": "crypto3.algebra", - "version": "0.1.0", - "summary": "=nil; Foundation C++ Computer Algebra System Finite Fields and Elliptic Curves", - "description": "Algebra system provides a set of Finite Fields, Elliptic Curves and Pairings evaluation algorithms implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation", - "Nikita Kaskov": "nbering@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/algebra.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "algebra", - "source_files": [ - "include/nil/crypto3/algebra/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] -} diff --git a/crypto3/libs/block/crypto3.block.podspec.json b/crypto3/libs/block/crypto3.block.podspec.json deleted file mode 100644 index 8bfc7839e2..0000000000 --- a/crypto3/libs/block/crypto3.block.podspec.json +++ /dev/null @@ -1,221 +0,0 @@ -{ - "name": "crypto3.block", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Block Ciphers", - "description": "Crypto3.Block library extends the =nil; Foundation's cryptography suite and provides a set of block ciphers implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/block.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "block", - "source_files": [ - "include/nil/crypto3/block/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/block/algorithm/*.{hpp}" - ] - }, - { - "name": "adaptor", - "source_files": [ - "include/nil/crypto3/block/adaptor/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/block/accumulators/*.{hpp}" - ], - "subspecs": [ - { - "name": "parameters", - "source_files": [ - "include/nil/crypto3/block/accumulators/parameters/*.{hpp}" - ] - } - ] - }, - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/block/detail/*.{hpp}" - ], - "subspecs": [ - { - "name": "aria", - "source_files": [ - "include/nil/crypto3/block/detail/aria/*.{hpp}" - ] - }, - { - "name": "blowfish", - "source_files": [ - "include/nil/crypto3/block/detail/blowfish/*.{hpp}" - ] - }, - { - "name": "camellia", - "source_files": [ - "include/nil/crypto3/block/detail/camellia/*.{hpp}" - ] - }, - { - "name": "cast", - "source_files": [ - "include/nil/crypto3/block/detail/cast/*.{hpp}" - ] - }, - { - "name": "des", - "source_files": [ - "include/nil/crypto3/block/detail/des/*.{hpp}" - ] - }, - { - "name": "gost_28147_89", - "source_files": [ - "include/nil/crypto3/block/detail/gost_28147_89/*.{hpp}" - ] - }, - { - "name": "idea", - "source_files": [ - "include/nil/crypto3/block/detail/idea/*.{hpp}" - ] - }, - { - "name": "kasumi", - "source_files": [ - "include/nil/crypto3/block/detail/kasumi/*.{hpp}" - ] - }, - { - "name": "md4", - "source_files": [ - "include/nil/crypto3/block/detail/md4/*.{hpp}" - ] - }, - { - "name": "md5", - "source_files": [ - "include/nil/crypto3/block/detail/md5/*.{hpp}" - ] - }, - { - "name": "misty1", - "source_files": [ - "include/nil/crypto3/block/detail/misty1/*.{hpp}" - ] - }, - { - "name": "noekeon", - "source_files": [ - "include/nil/crypto3/block/detail/noekeon/*.{hpp}" - ] - }, - { - "name": "rijndael", - "source_files": [ - "include/nil/crypto3/block/detail/rijndael/*.{hpp}" - ] - }, - { - "name": "seed", - "source_files": [ - "include/nil/crypto3/block/detail/seed/*.{hpp}" - ] - }, - { - "name": "serpent", - "source_files": [ - "include/nil/crypto3/block/detail/serpent/*.{hpp}" - ] - }, - { - "name": "shacal", - "source_files": [ - "include/nil/crypto3/block/detail/shacal/*.{hpp}" - ] - }, - { - "name": "sm4", - "source_files": [ - "include/nil/crypto3/block/detail/sm4/*.{hpp}" - ] - }, - { - "name": "streebog", - "source_files": [ - "include/nil/crypto3/block/detail/streebog/*.{hpp}" - ] - }, - { - "name": "threefish", - "source_files": [ - "include/nil/crypto3/block/detail/threefish/*.{hpp}" - ] - }, - { - "name": "twofish", - "source_files": [ - "include/nil/crypto3/block/detail/twofish/*.{hpp}" - ] - }, - { - "name": "utilities", - "source_files": [ - "include/nil/crypto3/block/detail/utilities/*.{hpp}" - ] - }, - { - "name": "xtea", - "source_files": [ - "include/nil/crypto3/block/detail/xtea/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/codec/crypto3.codec.podspec.json b/crypto3/libs/codec/crypto3.codec.podspec.json deleted file mode 100644 index 1bdc8f1e81..0000000000 --- a/crypto3/libs/codec/crypto3.codec.podspec.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "name": "crypto3.codec", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Codecs", - "description": "Crypto3.Codec library extends the =nil; Foundation's cryptography suite and provides a set of codecs implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/codec.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "codec", - "source_files": [ - "include/nil/crypto3/codec/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/codec/algorithm/*.{hpp}" - ] - }, - { - "name": "adaptor", - "source_files": [ - "include/nil/crypto3/codec/adaptor/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/codec/accumulators/*.{hpp}" - ], - "subspecs": [ - { - "name": "parameters", - "source_files": [ - "include/nil/crypto3/codec/accumulators/parameters/*.{hpp}" - ] - } - ] - }, - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/codec/detail/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/hash/crypto3.hash.podspec.json b/crypto3/libs/hash/crypto3.hash.podspec.json deleted file mode 100644 index 23c94a4bcc..0000000000 --- a/crypto3/libs/hash/crypto3.hash.podspec.json +++ /dev/null @@ -1,161 +0,0 @@ -{ - "name": "crypto3.hash", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Hashes", - "description": "Crypto3.Hash library extends the =nil; Foundation's cryptography suite and provides a set of hashes implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/hash.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "hash", - "source_files": [ - "include/nil/crypto3/hash/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/hash/algorithm/*.{hpp}" - ] - }, - { - "name": "adaptor", - "source_files": [ - "include/nil/crypto3/hash/adaptor/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/hash/accumulators/*.{hpp}" - ], - "subspecs": [ - { - "name": "parameters", - "source_files": [ - "include/nil/crypto3/hash/accumulators/parameters/*.{hpp}" - ] - } - ] - }, - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/hash/detail/*.{hpp}" - ], - "subspecs": [ - { - "name": "adler", - "source_files": [ - "include/nil/crypto3/hash/detail/adler/*.{hpp}" - ] - }, - { - "name": "blake2b", - "source_files": [ - "include/nil/crypto3/hash/detail/blake2b/*.{hpp}" - ] - }, - { - "name": "crc", - "source_files": [ - "include/nil/crypto3/hash/detail/crc/*.{hpp}" - ] - }, - { - "name": "ghash", - "source_files": [ - "include/nil/crypto3/hash/detail/ghash/*.{hpp}" - ] - }, - { - "name": "keccak", - "source_files": [ - "include/nil/crypto3/hash/detail/keccak/*.{hpp}" - ] - }, - { - "name": "ripemd", - "source_files": [ - "include/nil/crypto3/hash/detail/ripemd/*.{hpp}" - ] - }, - { - "name": "sha3", - "source_files": [ - "include/nil/crypto3/hash/detail/sha3/*.{hpp}" - ] - }, - { - "name": "skein", - "source_files": [ - "include/nil/crypto3/hash/detail/skein/*.{hpp}" - ] - }, - { - "name": "sm3", - "source_files": [ - "include/nil/crypto3/hash/detail/sm3/*.{hpp}" - ] - }, - { - "name": "streebog", - "source_files": [ - "include/nil/crypto3/hash/detail/streebog/*.{hpp}" - ] - }, - { - "name": "tiger", - "source_files": [ - "include/nil/crypto3/hash/detail/tiger/*.{hpp}" - ] - }, - { - "name": "whirlpool", - "source_files": [ - "include/nil/crypto3/hash/detail/whirlpool/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/kdf/crypto3.kdf.podspec.json b/crypto3/libs/kdf/crypto3.kdf.podspec.json deleted file mode 100644 index 1d62957b84..0000000000 --- a/crypto3/libs/kdf/crypto3.kdf.podspec.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "name": "crypto3.kdf", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite KDF", - "description": "Crypto3.KDF library extends the =nil; Foundation's cryptography suite and provides a set of key derivation functions implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/kdf.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "kdf", - "source_files": [ - "include/nil/crypto3/kdf/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/kdf/algorithm/*.{hpp}" - ] - }, - { - "name": "adaptor", - "source_files": [ - "include/nil/crypto3/kdf/adaptor/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/kdf/accumulators/*.{hpp}" - ] - }, - { - "name": "detail", - "subspecs": [ - { - "name": "hkdf", - "source_files": [ - "include/nil/crypto3/kdf/detail/hkdf/*.{hpp}" - ] - }, - { - "name": "kdf1", - "source_files": [ - "include/nil/crypto3/kdf/detail/kdf1/*.{hpp}" - ] - }, - { - "name": "kdf2", - "source_files": [ - "include/nil/crypto3/kdf/detail/kdf2/*.{hpp}" - ] - }, - { - "name": "kdf_iso18033", - "source_files": [ - "include/nil/crypto3/kdf/detail/kdf_iso18033/*.{hpp}" - ] - }, - { - "name": "prf_tls", - "source_files": [ - "include/nil/crypto3/kdf/detail/prf_tls/*.{hpp}" - ] - }, - { - "name": "prf_x942", - "source_files": [ - "include/nil/crypto3/kdf/detail/prf_x942/*.{hpp}" - ] - }, - { - "name": "sp800_56a", - "source_files": [ - "include/nil/crypto3/kdf/detail/sp800_56a/*.{hpp}" - ] - }, - { - "name": "sp800_56c", - "source_files": [ - "include/nil/crypto3/kdf/detail/sp800_56c/*.{hpp}" - ] - }, - { - "name": "sp800_108", - "source_files": [ - "include/nil/crypto3/kdf/detail/sp800_108/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/mac/crypto3.mac.podspec.json b/crypto3/libs/mac/crypto3.mac.podspec.json deleted file mode 100644 index 48e8499cb5..0000000000 --- a/crypto3/libs/mac/crypto3.mac.podspec.json +++ /dev/null @@ -1,117 +0,0 @@ -{ - "name": "crypto3.mac", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite MAC", - "description": "Crypto3.MAC library extends the =nil; Foundation's cryptography suite and provides a set of message authentication codes implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/mac.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "mac", - "source_files": [ - "include/nil/crypto3/mac/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/mac/algorithm/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/mac/accumulators/*.{hpp}" - ] - }, - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/mac/detail/*.{hpp}" - ], - "subspecs": [ - { - "name": "cbc_mac", - "source_files": [ - "include/nil/crypto3/mac/detail/cbc_mac/*.{hpp}" - ] - }, - { - "name": "cmac", - "source_files": [ - "include/nil/crypto3/mac/detail/cmac/*.{hpp}" - ] - }, - { - "name": "gmac", - "source_files": [ - "include/nil/crypto3/mac/detail/gmac/*.{hpp}" - ] - }, - { - "name": "hmac", - "source_files": [ - "include/nil/crypto3/mac/detail/hmac/*.{hpp}" - ] - }, - { - "name": "poly1305", - "source_files": [ - "include/nil/crypto3/mac/detail/poly1305/*.{hpp}" - ] - }, - { - "name": "siphash", - "source_files": [ - "include/nil/crypto3/mac/detail/siphash/*.{hpp}" - ] - }, - { - "name": "x919_mac", - "source_files": [ - "include/nil/crypto3/mac/detail/x919_mac/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/math/crypto3.math.podspec.json b/crypto3/libs/math/crypto3.math.podspec.json deleted file mode 100644 index dffd3cdebd..0000000000 --- a/crypto3/libs/math/crypto3.math.podspec.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "name": "cas.fft", - "version": "0.1.0", - "summary": "=nil; Foundation C++ Computer Algebra System Fast Fourier Transforms", - "description": "CAS.FFT library extends the =nil; Foundation's computer algebra system and provides a set of Fast Fourier Transforms evaluation algorithms implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/fft.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "fft", - "source_files": [ - "include/nil/crypto3/fft/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/vdf/algorithm/*.{hpp}" - ] - }, - { - "name": "adaptor", - "source_files": [ - "include/nil/crypto3/vdf/adaptor/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/vdf/accumulators/*.{hpp}" - ], - "subspecs": [ - { - "name": "parameters", - "source_files": [ - "include/nil/crypto3/vdf/accumulators/parameters/*.{hpp}" - ] - } - ] - }, - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/vdf/detail/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/modes/crypto3.modes.podspec.json b/crypto3/libs/modes/crypto3.modes.podspec.json deleted file mode 100644 index 426148648d..0000000000 --- a/crypto3/libs/modes/crypto3.modes.podspec.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "name": "crypto3.modes", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Cipher Modes", - "description": "Crypto3.Mac library extends the =nil; Foundation's cryptography suite and provides a set of cipher modes implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/modes.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "modes", - "source_files": [ - "include/nil/crypto3/modes/*.{hpp}" - ], - "subspecs": [ - { - "name": "aead", - "source_files": [ - "include/nil/crypto3/modes/aead/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/passhash/crypto3.passhash.podspec.json b/crypto3/libs/passhash/crypto3.passhash.podspec.json deleted file mode 100644 index 0288b17845..0000000000 --- a/crypto3/libs/passhash/crypto3.passhash.podspec.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "name": "crypto3.passhash", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Cipher Passhash", - "description": "Crypto3.Passhash library extends the =nil; Foundation's cryptography suite and provides a set of password hashing techniques implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/passhash.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "passhash", - "source_files": [ - "include/nil/crypto3/passhash/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/passhash/algorithm/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/passhash/accumulators/*.{hpp}" - ], - "subspecs": [ - { - "name": "parameters", - "source_files": [ - "include/nil/crypto3/passhash/accumulators/parameters/*.{hpp}" - ] - } - ] - }, - { - "name": "detail", - "subspecs": [ - { - "name": "bcrypt", - "source_files": [ - "include/nil/crypto3/passhash/detail/bcrypt/*.{hpp}" - ] - }, - { - "name": "passhash9", - "source_files": [ - "include/nil/crypto3/passhash/detail/passhash9/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} diff --git a/crypto3/libs/pbkdf/crypto3.pbkdf.podspec.json b/crypto3/libs/pbkdf/crypto3.pbkdf.podspec.json deleted file mode 100644 index 4563144ecf..0000000000 --- a/crypto3/libs/pbkdf/crypto3.pbkdf.podspec.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "name": "crypto3.pbkdf", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Cipher PBKDF", - "description": "Crypto3.PBKDF library extends the =nil; Foundation's cryptography suite and provides a set of password-based key derivation functions implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/pbkdf.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "pbkdf", - "source_files": [ - "include/nil/crypto3/pbkdf/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/pbkdf/algorithm/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/pbkdf/accumulators/*.{hpp}" - ], - "subspecs": [ - { - "name": "parameters", - "source_files": [ - "include/nil/crypto3/pbkdf/accumulators/parameters/*.{hpp}" - ] - } - ] - }, - { - "name": "detail", - "subspecs": [ - { - "name": "pbkdf1", - "source_files": [ - "include/nil/crypto3/pbkdf/detail/pbkdf1/*.{hpp}" - ] - }, - { - "name": "pbkdf2", - "source_files": [ - "include/nil/crypto3/pbkdf/detail/pbkdf2/*.{hpp}" - ] - }, - { - "name": "pgp_s2k", - "source_files": [ - "include/nil/crypto3/pbkdf/detail/pgp_s2k/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/pkpad/crypto3.pkpad.podspec.json b/crypto3/libs/pkpad/crypto3.pkpad.podspec.json deleted file mode 100644 index 6ef7c83a37..0000000000 --- a/crypto3/libs/pkpad/crypto3.pkpad.podspec.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "crypto3.pkpad", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Cipher PBKDF", - "description": "Crypto3.PBKDF library extends the =nil; Foundation's cryptography suite and provides a set of public key padding schemes implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/pkpad.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "pkpad", - "source_files": [ - "include/nil/crypto3/pkpad/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/pkpad/algorithm/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/pkpad/accumulators/*.{hpp}" - ], - "subspecs": [ - { - "name": "parameters", - "source_files": [ - "include/nil/crypto3/pkpad/accumulators/parameters/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/stream/crypto3.stream.podspec.json b/crypto3/libs/stream/crypto3.stream.podspec.json deleted file mode 100644 index 264bdab0d8..0000000000 --- a/crypto3/libs/stream/crypto3.stream.podspec.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "name": "crypto3.stream", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Cipher Stream", - "description": "Crypto3.Stream library extends the =nil; Foundation's cryptography suite and provides a set of stream ciphers implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/stream.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "stream", - "source_files": [ - "include/nil/crypto3/stream/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/stream/algorithm/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/stream/accumulators/*.{hpp}" - ], - "subspecs": [ - { - "name": "parameters", - "source_files": [ - "include/nil/crypto3/stream/accumulators/parameters/*.{hpp}" - ] - } - ] - }, - { - "name": "detail", - "subspecs": [ - { - "name": "chacha", - "source_files": [ - "include/nil/crypto3/stream/detail/chacha/*.{hpp}" - ] - }, - { - "name": "ctr", - "source_files": [ - "include/nil/crypto3/stream/detail/ctr/*.{hpp}" - ] - }, - { - "name": "rc4", - "source_files": [ - "include/nil/crypto3/stream/detail/rc4/*.{hpp}" - ] - }, - { - "name": "salsa20", - "source_files": [ - "include/nil/crypto3/stream/detail/salsa20/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/threshold/crypto3.threshold.podspec.json b/crypto3/libs/threshold/crypto3.threshold.podspec.json deleted file mode 100644 index 426148648d..0000000000 --- a/crypto3/libs/threshold/crypto3.threshold.podspec.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "name": "crypto3.modes", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Cipher Modes", - "description": "Crypto3.Mac library extends the =nil; Foundation's cryptography suite and provides a set of cipher modes implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/modes.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "modes", - "source_files": [ - "include/nil/crypto3/modes/*.{hpp}" - ], - "subspecs": [ - { - "name": "aead", - "source_files": [ - "include/nil/crypto3/modes/aead/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/vdf/crypto3.vdf.podspec.json b/crypto3/libs/vdf/crypto3.vdf.podspec.json deleted file mode 100644 index d7093452f8..0000000000 --- a/crypto3/libs/vdf/crypto3.vdf.podspec.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "name": "crypto3.vdf", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Cipher VDF", - "description": "Crypto3.VDF library extends the =nil; Foundation's cryptography suite and provides a set of verifiable delay functions implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/vdf.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "vdf", - "source_files": [ - "include/nil/crypto3/vdf/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/vdf/algorithm/*.{hpp}" - ] - }, - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/vdf/detail/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file diff --git a/crypto3/libs/zk/crypto3.zk.podspec.json b/crypto3/libs/zk/crypto3.zk.podspec.json deleted file mode 100644 index 945ae83466..0000000000 --- a/crypto3/libs/zk/crypto3.zk.podspec.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "name": "crypto3.zk", - "version": "0.1.0", - "summary": "=nil; Crypto3 C++ Cryptography Suite Cipher VDF", - "description": "Crypto3.VDF library extends the =nil; Foundation's cryptography suite and provides a set of verifiable delay functions implemented in way C++ standard library implies: concepts, algorithms, predictable behavior, latest standard features support and clean architecture without compromising security and performance.", - "homepage": "http://crypto3.nil.foundation/projects/crypto3", - "license": "Boost Software License", - "authors": { - "Mikhail Komarov": "nemo@nil.foundation" - }, - "platforms": { - "ios": "5.0", - "osx": "10.7" - }, - "source": { - "git": "https://github.com/nilfoundation/vdf.git", - "branch": "master" - }, - "xcconfig": { - "CLANG_CXX_LANGUAGE_STANDARD": "c++17", - "CLANG_CXX_LIBRARY": "libc++", - "HEADER_SEARCH_PATHS": "\"${PODS_ROOT}/include/\"" - }, - "subspecs": [ - { - "name": "include", - "subspecs": [ - { - "name": "nil", - "subspecs": [ - { - "name": "crypto3", - "subspecs": [ - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/detail/*.{hpp}" - ] - }, - { - "name": "vdf", - "source_files": [ - "include/nil/crypto3/vdf/*.{hpp}" - ], - "subspecs": [ - { - "name": "algorithm", - "source_files": [ - "include/nil/crypto3/vdf/algorithm/*.{hpp}" - ] - }, - { - "name": "adaptor", - "source_files": [ - "include/nil/crypto3/vdf/adaptor/*.{hpp}" - ] - }, - { - "name": "accumulators", - "source_files": [ - "include/nil/crypto3/vdf/accumulators/*.{hpp}" - ], - "subspecs": [ - { - "name": "parameters", - "source_files": [ - "include/nil/crypto3/vdf/accumulators/parameters/*.{hpp}" - ] - } - ] - }, - { - "name": "detail", - "source_files": [ - "include/nil/crypto3/vdf/detail/*.{hpp}" - ] - } - ] - } - ] - } - ] - } - ] - } - ] -} \ No newline at end of file From 0b4575e5ff2e48cab88720c84af23335c4414ab1 Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Fri, 20 Sep 2024 23:00:53 +0200 Subject: [PATCH 3/5] use clang-19 --- flake.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 290f13bcc3..78bf82f540 100644 --- a/flake.nix +++ b/flake.nix @@ -184,12 +184,12 @@ enableDebug = false; }); crypto3-clang = (pkgs.callPackage ./crypto3/crypto3.nix { - stdenv = pkgs.llvmPackages_18.stdenv; + stdenv = pkgs.llvmPackages_19.stdenv; runTests = true; enableDebug = false; }); crypto3-clang-sanitize = (pkgs.callPackage ./crypto3/crypto3.nix { - stdenv = pkgs.llvmPackages_18.stdenv; + stdenv = pkgs.llvmPackages_19.stdenv; runTests = true; enableDebug = false; sanitize = true; @@ -201,7 +201,7 @@ crypto3 = packages.crypto3; }); parallel-crypto3-clang = (pkgs.callPackage ./parallel-crypto3/parallel-crypto3.nix { - stdenv = pkgs.llvmPackages_18.stdenv; + stdenv = pkgs.llvmPackages_19.stdenv; runTests = true; enableDebug = false; crypto3 = crypto3-clang; @@ -213,7 +213,7 @@ crypto3 = packages.crypto3; }); evm-assigner-clang = (pkgs.callPackage ./evm-assigner/evm-assigner.nix { - stdenv = pkgs.llvmPackages_18.stdenv; + stdenv = pkgs.llvmPackages_19.stdenv; runTests = true; enableDebug = false; crypto3 = crypto3-clang; @@ -232,7 +232,7 @@ crypto3 = packages.crypto3; }); transpiler-clang = (pkgs.callPackage ./transpiler/transpiler.nix { - stdenv = pkgs.llvmPackages_18.stdenv; + stdenv = pkgs.llvmPackages_19.stdenv; runTests = true; enableDebug = false; crypto3 = crypto3-clang; @@ -246,7 +246,7 @@ parallel-crypto3 = packages.parallel-crypto3; }); proof-producer-clang = (pkgs.callPackage ./proof-producer/proof-producer.nix { - stdenv = pkgs.llvmPackages_18.stdenv; + stdenv = pkgs.llvmPackages_19.stdenv; runTests = true; enableDebug = false; crypto3 = crypto3-clang; From bbf59e7142d7390ca767560016d86c4b1b86cfef Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Fri, 20 Sep 2024 23:33:28 +0200 Subject: [PATCH 4/5] fix crypto3 tests affected by clang-19 --- .../curves/detail/r1cs/fixed_base_mul_zcash.hpp | 2 +- .../blueprint/components/merkle_tree/r1cs/prove.hpp | 2 +- .../include/nil/crypto3/container/merkle/tree.hpp | 6 +++--- .../libs/hash/include/nil/crypto3/hash/pedersen.hpp | 2 +- crypto3/libs/hash/test/hash_to_curve.cpp | 2 +- crypto3/libs/marshalling/zk/test/plonk_gates.cpp | 8 ++++---- .../include/nil/crypto3/math/polynomial/polynomial.hpp | 4 ++-- .../nil/crypto3/math/polynomial/polynomial_dfs.hpp | 4 ++-- .../crypto3/math/polynomial/polynomial_dfs_view.hpp | 8 ++++---- .../nil/crypto3/math/polynomial/polynomial_view.hpp | 8 ++++---- .../libs/random/include/nil/crypto3/random/rfc6979.hpp | 8 ++++---- .../ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp | 10 +++++----- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/crypto3/libs/blueprint/include/nil/blueprint/components/algebra/curves/detail/r1cs/fixed_base_mul_zcash.hpp b/crypto3/libs/blueprint/include/nil/blueprint/components/algebra/curves/detail/r1cs/fixed_base_mul_zcash.hpp index 9c7d9bd811..0e5bb70699 100644 --- a/crypto3/libs/blueprint/include/nil/blueprint/components/algebra/curves/detail/r1cs/fixed_base_mul_zcash.hpp +++ b/crypto3/libs/blueprint/include/nil/blueprint/components/algebra/curves/detail/r1cs/fixed_base_mul_zcash.hpp @@ -224,7 +224,7 @@ namespace nil { detail::blueprint_variable pad_i; pad_i.allocate(bp); bp.val(pad_i) = field_value_type::zero(); - padded_input.template emplace_back(pad_i); + padded_input.template emplace_back<>(pad_i); } return padded_input; } diff --git a/crypto3/libs/blueprint/include/nil/blueprint/components/merkle_tree/r1cs/prove.hpp b/crypto3/libs/blueprint/include/nil/blueprint/components/merkle_tree/r1cs/prove.hpp index 26df8676ba..18cece40cb 100644 --- a/crypto3/libs/blueprint/include/nil/blueprint/components/merkle_tree/r1cs/prove.hpp +++ b/crypto3/libs/blueprint/include/nil/blueprint/components/merkle_tree/r1cs/prove.hpp @@ -59,7 +59,7 @@ namespace nil { std::vector> layer; for (std::size_t j = 0; j < Arity; ++j) { - layer.template emplace_back( + layer.template emplace_back<>( digest_variable(this->bp, HashComponent::digest_bits)); } diff --git a/crypto3/libs/containers/include/nil/crypto3/container/merkle/tree.hpp b/crypto3/libs/containers/include/nil/crypto3/container/merkle/tree.hpp index 145802635c..18d4ee87e4 100644 --- a/crypto3/libs/containers/include/nil/crypto3/container/merkle/tree.hpp +++ b/crypto3/libs/containers/include/nil/crypto3/container/merkle/tree.hpp @@ -394,12 +394,12 @@ namespace nil { // template reference emplace_back(Args &&..._args) { - return _hashes.template emplace_back(_args...); + return _hashes.template emplace_back<>(_args...); } template iterator emplace(const_iterator _position, Args &&... _args) { - return _hashes.template emplace(_position, _args...); + return _hashes.template emplace<>(_position, _args...); } void pop_back() { @@ -421,7 +421,7 @@ namespace nil { void swap(merkle_tree_impl &other) { _hashes.swap(other.hashes()); std::swap(_leaves, other.leaves()); - std::swap(_rc, other.rc()); + std::swap(_rc, other.row_count()); std::swap(_size, other.size()); } diff --git a/crypto3/libs/hash/include/nil/crypto3/hash/pedersen.hpp b/crypto3/libs/hash/include/nil/crypto3/hash/pedersen.hpp index 23e2e23c96..88f4238f53 100644 --- a/crypto3/libs/hash/include/nil/crypto3/hash/pedersen.hpp +++ b/crypto3/libs/hash/include/nil/crypto3/hash/pedersen.hpp @@ -136,7 +136,7 @@ namespace nil { public: inline void update(bool b) { - cached_bits.template emplace_back(b); + cached_bits.template emplace_back<>(b); ++bits_supplied; if (cached_bits.size() == chunk_bits) { ///< we could proceed if whole chunk was supplied if (is_time_to_go_to_new_segment()) { diff --git a/crypto3/libs/hash/test/hash_to_curve.cpp b/crypto3/libs/hash/test/hash_to_curve.cpp index 65221b352e..d6ee85c7ea 100644 --- a/crypto3/libs/hash/test/hash_to_curve.cpp +++ b/crypto3/libs/hash/test/hash_to_curve.cpp @@ -87,7 +87,7 @@ void check_expand_message(std::size_t len_in_bytes, const DstType &dst, const Ms return ret; }; std::vector uniform_bytes(len_in_bytes, 0); - Expander::template process(len_in_bytes, msg, dst, uniform_bytes); + Expander::template process<>(len_in_bytes, msg, dst, uniform_bytes); BOOST_CHECK(result_compare(uniform_bytes)); } diff --git a/crypto3/libs/marshalling/zk/test/plonk_gates.cpp b/crypto3/libs/marshalling/zk/test/plonk_gates.cpp index adb6b01f63..60eaa645e1 100644 --- a/crypto3/libs/marshalling/zk/test/plonk_gates.cpp +++ b/crypto3/libs/marshalling/zk/test/plonk_gates.cpp @@ -128,7 +128,7 @@ generate_random_plonk_gate(std::size_t vars_n, std::size_t depth, std::size_t co std::size_t selector_index = rand() % vars_n; std::vector constraints; for (std::size_t i = 0; i < constr_n; i++) { - constraints.template emplace_back( + constraints.template emplace_back<>( generate_random_plonk_expression( vars_n, depth ) ); } @@ -162,7 +162,7 @@ generate_random_plonk_lookup_gate(std::size_t vars_n, std::size_t depth, std::si std::size_t selector_index = std::random_device()(); std::vector constraints; for (std::size_t i = 0; i < constr_n; i++) { - constraints.template emplace_back(generate_random_plonk_lookup_constraint(vars_n, depth, expr_n)); + constraints.template emplace_back<>(generate_random_plonk_lookup_constraint(vars_n, depth, expr_n)); } return {selector_index, constraints}; } @@ -506,7 +506,7 @@ void test_plonk_gates(std::size_t vars_n, std::size_t depth, std::size_t constr_ std::vector val; for (std::size_t i = 0; i < gates_n; i++) { - val.template emplace_back(generate_random_plonk_gate(vars_n, depth, constr_n)); + val.template emplace_back<>(generate_random_plonk_gate(vars_n, depth, constr_n)); } auto filled_val = types::fill_plonk_gates(val); @@ -539,7 +539,7 @@ void test_plonk_lookup_gates(std::size_t vars_n, std::size_t depth, std::size_t std::vector val; for (std::size_t i = 0; i < gates_n; i++) { - val.template emplace_back(generate_random_plonk_lookup_gate(vars_n, depth, expr_n, constr_n)); + val.template emplace_back<>(generate_random_plonk_lookup_gate(vars_n, depth, expr_n, constr_n)); } auto filled_val = types::fill_plonk_lookup_gates(val); diff --git a/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial.hpp b/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial.hpp index 80be1e775b..6c4efd938a 100644 --- a/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial.hpp +++ b/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial.hpp @@ -313,7 +313,7 @@ namespace nil { template reference emplace_back(Args&&... _args) { - return val.template emplace_back(_args...); + return val.template emplace_back<>(_args...); } void pop_back() { @@ -330,7 +330,7 @@ namespace nil { template iterator emplace(const_iterator _position, Args&&... _args) { - return val.template emplace(_position, _args...); + return val.template emplace<>(_position, _args...); } iterator insert(const_iterator _position, size_type _n, const_reference _x) { diff --git a/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp b/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp index 16c9a2c202..ed611bff3e 100644 --- a/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp +++ b/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp @@ -288,7 +288,7 @@ namespace nil { template reference emplace_back(Args&&... _args) { - return val.template emplace_back(_args...); + return val.template emplace_back<>(_args...); } void pop_back() { @@ -304,7 +304,7 @@ namespace nil { } template iterator emplace(const_iterator _position, Args&&... _args) { - return val.template emplace(_position, _args...); + return val.template emplace<>(_position, _args...); } iterator insert(const_iterator _position, size_type _n, const_reference _x) { diff --git a/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs_view.hpp b/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs_view.hpp index 2ba563f2ad..d75db092e3 100644 --- a/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs_view.hpp +++ b/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_dfs_view.hpp @@ -102,7 +102,7 @@ namespace nil { // } bool operator==(const polynomial_dfs_view& rhs) const { - return (*it) == (*(rhs.it)) && _d == rhs.d; + return (*it) == (*(rhs.it)) && _d == rhs._d; } bool operator!=(const polynomial_dfs_view& rhs) const { return !(rhs == *this); @@ -239,7 +239,7 @@ namespace nil { template reference emplace_back(Args&&... _args) { - return it.template emplace_back(_args...); + return it.template emplace_back<>(_args...); } void pop_back() { @@ -255,7 +255,7 @@ namespace nil { } template iterator emplace(const_iterator _position, Args&&... _args) { - return it.template emplace(_position, _args...); + return it.template emplace<>(_position, _args...); } iterator insert(const_iterator _position, size_type _n, const_reference _x) { @@ -309,7 +309,7 @@ namespace nil { // } void swap(polynomial_dfs_view& other) { - it.swap(other.val); + it.swap(other.data()); std::swap(_d, other._d); } diff --git a/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_view.hpp b/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_view.hpp index 3b105d30e6..2c0d93ab4b 100644 --- a/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_view.hpp +++ b/crypto3/libs/math/include/nil/crypto3/math/polynomial/polynomial_view.hpp @@ -232,7 +232,7 @@ namespace nil { template reference emplace_back(Args&&... _args) { - return it.template emplace_back(_args...); + return it.template emplace_back<>(_args...); } void pop_back() { @@ -248,7 +248,7 @@ namespace nil { } template iterator emplace(const_iterator _position, Args&&... _args) { - return it.template emplace(_position, _args...); + return it.template emplace<>(_position, _args...); } iterator insert(const_iterator _position, size_type _n, const_reference _x) { @@ -285,7 +285,7 @@ namespace nil { } void swap(polynomial_view& other) { - it.swap(other.val); + it.swap(other.data()); } template @@ -406,7 +406,7 @@ namespace nil { } nil::crypto3::math::condense(q); - this->template assign(q.begin(), q.end()); + this->template assign<>(q.begin(), q.end()); return *this; } diff --git a/crypto3/libs/random/include/nil/crypto3/random/rfc6979.hpp b/crypto3/libs/random/include/nil/crypto3/random/rfc6979.hpp index 0f61af8da4..4e831bef5f 100644 --- a/crypto3/libs/random/include/nil/crypto3/random/rfc6979.hpp +++ b/crypto3/libs/random/include/nil/crypto3/random/rfc6979.hpp @@ -133,11 +133,11 @@ namespace nil { for (const auto v : range) { bitset_repr_type v_bitset_repr(v); carried_bits = carry_bits(v_bitset_repr, carried_bits); - result.template emplace_back(static_cast(v_bitset_repr.to_ullong())); + result.template emplace_back<>(static_cast(v_bitset_repr.to_ullong())); } bitset_repr_type v_bitset_repr; carry_bits(v_bitset_repr, carried_bits); - result.template emplace_back(static_cast(v_bitset_repr.to_ullong())); + result.template emplace_back<>(static_cast(v_bitset_repr.to_ullong())); return result; } @@ -151,7 +151,7 @@ namespace nil { auto adjusted_range = adjust_bitstring(range); marshalling_integral_value_be_type marshalling_integral_value_be; auto it = adjusted_range.cbegin(); - marshalling_integral_value_be.template read(it, modulus_octets); + marshalling_integral_value_be.template read<>(it, modulus_octets); result = marshalling_integral_value_be.value(); } else { // TODO: creating copy of input range of modulus_octets size is a bottleneck: @@ -163,7 +163,7 @@ namespace nil { std::copy(std::crbegin(range), std::crend(range), std::rbegin(range_padded)); marshalling_integral_value_be_type marshalling_integral_value_be; auto it = std::cbegin(range_padded); - marshalling_integral_value_be.template read(it, range_padded.size()); + marshalling_integral_value_be.template read<>(it, range_padded.size()); result = marshalling_integral_value_be.value(); } return result; diff --git a/crypto3/libs/zk/include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp b/crypto3/libs/zk/include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp index 67b3937ac5..163be38232 100644 --- a/crypto3/libs/zk/include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp +++ b/crypto3/libs/zk/include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp @@ -508,15 +508,15 @@ namespace nil { pc.merge_random(a_input1.begin(), a_input1.end(), b_input1.begin(), b_input1.end(), final_res.zab); // final_aB.0 = T = e(A,v1)e(w1,B) - a_input1.template emplace_back(proof.tmipp.gipa.final_wkey.first); - b_input1.template emplace(b_input1.begin(), proof.tmipp.gipa.final_vkey.first); + a_input1.template emplace_back<>(proof.tmipp.gipa.final_wkey.first); + b_input1.template emplace<>(b_input1.begin(), proof.tmipp.gipa.final_vkey.first); pc.merge_random(a_input1.begin(), a_input1.end(), b_input1.begin(), b_input1.end(), final_res.tab); // final_aB.1 = U = e(A,v2)e(w2,B) a_input1.pop_back(); - a_input1.template emplace_back(proof.tmipp.gipa.final_wkey.second); + a_input1.template emplace_back<>(proof.tmipp.gipa.final_wkey.second); b_input1.erase(b_input1.begin()); - b_input1.template emplace(b_input1.begin(), proof.tmipp.gipa.final_vkey.second); + b_input1.template emplace<>(b_input1.begin(), proof.tmipp.gipa.final_vkey.second); pc.merge_random(a_input1.begin(), a_input1.end(), b_input1.begin(), b_input1.end(), final_res.uab); // MIPP @@ -536,7 +536,7 @@ namespace nil { // U = e(A,v2) b_input2.pop_back(); - b_input2.template emplace_back(proof.tmipp.gipa.final_vkey.second); + b_input2.template emplace_back<>(proof.tmipp.gipa.final_vkey.second); pc.merge_random(a_input2.begin(), a_input2.end(), b_input2.begin(), b_input2.end(), final_res.uc); if (final_z != final_res.zc) { From 31451a2e064768d33295eeef50f757aa6e395412 Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Sun, 22 Sep 2024 10:35:36 +0200 Subject: [PATCH 5/5] fix parallel-crypto3 tests affected by clang-19 --- .../include/nil/crypto3/container/merkle/tree.hpp | 6 +++--- .../include/nil/crypto3/math/polynomial/polynomial.hpp | 4 ++-- .../nil/crypto3/math/polynomial/polynomial_dfs.hpp | 4 ++-- .../crypto3/math/polynomial/polynomial_dfs_view.hpp | 8 ++++---- .../nil/crypto3/math/polynomial/polynomial_view.hpp | 8 ++++---- .../ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp | 10 +++++----- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/parallel-crypto3/libs/parallel-containers/include/nil/crypto3/container/merkle/tree.hpp b/parallel-crypto3/libs/parallel-containers/include/nil/crypto3/container/merkle/tree.hpp index 1fcf812596..cc6933af1c 100644 --- a/parallel-crypto3/libs/parallel-containers/include/nil/crypto3/container/merkle/tree.hpp +++ b/parallel-crypto3/libs/parallel-containers/include/nil/crypto3/container/merkle/tree.hpp @@ -397,12 +397,12 @@ namespace nil { // template reference emplace_back(Args &&..._args) { - return _hashes.template emplace_back(_args...); + return _hashes.template emplace_back<>(_args...); } template iterator emplace(const_iterator _position, Args &&... _args) { - return _hashes.template emplace(_position, _args...); + return _hashes.template emplace<>(_position, _args...); } void pop_back() { @@ -424,7 +424,7 @@ namespace nil { void swap(merkle_tree_impl &other) { _hashes.swap(other.hashes()); std::swap(_leaves, other.leaves()); - std::swap(_rc, other.rc()); + std::swap(_rc, other.row_count()); std::swap(_size, other.size()); } diff --git a/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial.hpp b/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial.hpp index a3fcbe2209..53828a351c 100644 --- a/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial.hpp +++ b/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial.hpp @@ -313,7 +313,7 @@ namespace nil { template reference emplace_back(Args&&... _args) { - return val.template emplace_back(_args...); + return val.template emplace_back<>(_args...); } void pop_back() { @@ -330,7 +330,7 @@ namespace nil { template iterator emplace(const_iterator _position, Args&&... _args) { - return val.template emplace(_position, _args...); + return val.template emplace<>(_position, _args...); } iterator insert(const_iterator _position, size_type _n, const_reference _x) { diff --git a/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp b/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp index 24bcd40faf..4d1aa32400 100644 --- a/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp +++ b/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs.hpp @@ -290,7 +290,7 @@ namespace nil { template reference emplace_back(Args&&... _args) { - return val.template emplace_back(_args...); + return val.template emplace_back<>(_args...); } void pop_back() { @@ -306,7 +306,7 @@ namespace nil { } template iterator emplace(const_iterator _position, Args&&... _args) { - return val.template emplace(_position, _args...); + return val.template emplace<>(_position, _args...); } iterator insert(const_iterator _position, size_type _n, const_reference _x) { diff --git a/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs_view.hpp b/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs_view.hpp index 2ba563f2ad..e358eece61 100644 --- a/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs_view.hpp +++ b/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_dfs_view.hpp @@ -102,7 +102,7 @@ namespace nil { // } bool operator==(const polynomial_dfs_view& rhs) const { - return (*it) == (*(rhs.it)) && _d == rhs.d; + return (*it) == (*(rhs.it)) && _d == rhs.data(); } bool operator!=(const polynomial_dfs_view& rhs) const { return !(rhs == *this); @@ -239,7 +239,7 @@ namespace nil { template reference emplace_back(Args&&... _args) { - return it.template emplace_back(_args...); + return it.template emplace_back<>(_args...); } void pop_back() { @@ -255,7 +255,7 @@ namespace nil { } template iterator emplace(const_iterator _position, Args&&... _args) { - return it.template emplace(_position, _args...); + return it.template emplace<>(_position, _args...); } iterator insert(const_iterator _position, size_type _n, const_reference _x) { @@ -309,7 +309,7 @@ namespace nil { // } void swap(polynomial_dfs_view& other) { - it.swap(other.val); + it.swap(other.data()); std::swap(_d, other._d); } diff --git a/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_view.hpp b/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_view.hpp index 236a5893b9..a3f9cea65c 100644 --- a/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_view.hpp +++ b/parallel-crypto3/libs/parallel-math/include/nil/crypto3/math/polynomial/polynomial_view.hpp @@ -233,7 +233,7 @@ namespace nil { template reference emplace_back(Args&&... _args) { - return it.template emplace_back(_args...); + return it.template emplace_back<>(_args...); } void pop_back() { @@ -249,7 +249,7 @@ namespace nil { } template iterator emplace(const_iterator _position, Args&&... _args) { - return it.template emplace(_position, _args...); + return it.template emplace<>(_position, _args...); } iterator insert(const_iterator _position, size_type _n, const_reference _x) { @@ -286,7 +286,7 @@ namespace nil { } void swap(polynomial_view& other) { - it.swap(other.val); + it.swap(other.data()); } template @@ -408,7 +408,7 @@ namespace nil { } nil::crypto3::math::condense(q); - this->template assign(q.begin(), q.end()); + this->template assign<>(q.begin(), q.end()); return *this; } diff --git a/parallel-crypto3/libs/parallel-zk/include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp b/parallel-crypto3/libs/parallel-zk/include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp index 67b3937ac5..163be38232 100644 --- a/parallel-crypto3/libs/parallel-zk/include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp +++ b/parallel-crypto3/libs/parallel-zk/include/nil/crypto3/zk/snark/systems/ppzksnark/r1cs_gg_ppzksnark/ipp2/verifier.hpp @@ -508,15 +508,15 @@ namespace nil { pc.merge_random(a_input1.begin(), a_input1.end(), b_input1.begin(), b_input1.end(), final_res.zab); // final_aB.0 = T = e(A,v1)e(w1,B) - a_input1.template emplace_back(proof.tmipp.gipa.final_wkey.first); - b_input1.template emplace(b_input1.begin(), proof.tmipp.gipa.final_vkey.first); + a_input1.template emplace_back<>(proof.tmipp.gipa.final_wkey.first); + b_input1.template emplace<>(b_input1.begin(), proof.tmipp.gipa.final_vkey.first); pc.merge_random(a_input1.begin(), a_input1.end(), b_input1.begin(), b_input1.end(), final_res.tab); // final_aB.1 = U = e(A,v2)e(w2,B) a_input1.pop_back(); - a_input1.template emplace_back(proof.tmipp.gipa.final_wkey.second); + a_input1.template emplace_back<>(proof.tmipp.gipa.final_wkey.second); b_input1.erase(b_input1.begin()); - b_input1.template emplace(b_input1.begin(), proof.tmipp.gipa.final_vkey.second); + b_input1.template emplace<>(b_input1.begin(), proof.tmipp.gipa.final_vkey.second); pc.merge_random(a_input1.begin(), a_input1.end(), b_input1.begin(), b_input1.end(), final_res.uab); // MIPP @@ -536,7 +536,7 @@ namespace nil { // U = e(A,v2) b_input2.pop_back(); - b_input2.template emplace_back(proof.tmipp.gipa.final_vkey.second); + b_input2.template emplace_back<>(proof.tmipp.gipa.final_vkey.second); pc.merge_random(a_input2.begin(), a_input2.end(), b_input2.begin(), b_input2.end(), final_res.uc); if (final_z != final_res.zc) {