Merge branch 'master' into 'ws15'

# Conflicts: # fr/index.md
dalibo · Feb 14, 2023 · 212d4c1 · 212d4c1
2 parents e9364ce + 17aa78c
commit 212d4c1
Show file tree

Hide file tree

Showing 9 changed files with 1,744 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -53,6 +53,21 @@ make ws15
 Previous workshops generated files are versionned under `_archives_` folder with
 the same logic to preserve templates made in the past.
 
+Refresh the github mirror
+------------------------------------------------------------------------------- 
+
+```
+git clone git@github.com:dalibo/workshops.git
+cd workshops
+git remote add upstream git@gitlab.dalibo.info:formation/workshops.git
+git fetch upstream
+git rebase upstream/master
+git push --force-with-lease
+```
+
+> DO NOT use `git push --force` on the master branch.
+
+
 Contribute
 ------------------------------------------------------------------------------- 
 

diff --git a/fr/atelier_pgsodium/README b/fr/atelier_pgsodium/README
@@ -0,0 +1,9 @@
+# Atelier chiffrement de donnée
+
+Auteurs:
+* Frédéric Yhuel
+* Jehan-Guillaume de Rorthais
+
+Le but de l'atelier est de construire une instance contenant des
+colonnes chiffrées en utilisant l'extension pgsodium.
+
diff --git a/fr/atelier_pgsodium/medias/NIST.SP.800-57pt1r5.pdf b/fr/atelier_pgsodium/medias/NIST.SP.800-57pt1r5.pdf
diff --git a/fr/atelier_pgsodium/medias/PCI-DSS-v4_0.pdf b/fr/atelier_pgsodium/medias/PCI-DSS-v4_0.pdf
diff --git a/fr/atelier_pgsodium/medias/cover.jpg b/fr/atelier_pgsodium/medias/cover.jpg