blackbeard420/kore
1
0
Fork 0
mirror of https://github.com/jorisvink/kore synced 2025-03-09 20:49:01 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 4.x-releng

Browse Source
This commit is contained in:
Joris Vink 2022-04-20 11:38:50 +02:00
commit 66de41fb8a
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
RELEASE.md Normal file
View File

@ -0,0 +1,31 @@
Kore release procedure:
$next = next release
$prev = previous release
kore:
$ git checkout 4.x-releng
$ git merge master
[update RELEASE, README.md]
$ git commit -a -m "update for $next"
$ git tag -a $next -m "Kore $next"
$ git archive --format=tgz --prefix=kore-$next/ -o ~/kore-$next.tgz $next
$ minisign -S -c "Kore $next release" -m kore-$next.tar.gz
$ shasum -a256 kore-$next.tar.gz > kore-$next.tar.gz.sha256
$ git push --tags origin 4.x-releng
$ git push --tags github 4.x-releng
kore-site:
$ cp ~/kore-$next* webroot/releases
$ cp webroot/releases/$prev.html webroot/releases/$next.html
[update all relevant links]
[write changelog on release page]
$ git add webroot && git commit -a -m "update to $next"
$ git push origin master
[on nightfall]
$ cd kore-site && git pull origin master && make install-docs
kore-docker:
$ cp -R $prev $next
$ ./build.sh $next

10
src/python.c
View File

@ -2971,10 +2971,11 @@ pyconnection_get_peer_x509dict(struct pyconnection *pyc, void *closure)
goto out; goto out;
} }
if (!kore_tls_x509name_foreach(name, 0, issuer, pyconnection_x509_cb)) { if (!kore_tls_x509name_foreach(name, 0, subject,
pyconnection_x509_cb)) {
if (PyErr_Occurred() == NULL) { if (PyErr_Occurred() == NULL) {
PyErr_Format(PyExc_RuntimeError, PyErr_Format(PyExc_RuntimeError,
"failed to add issuer name to dictionary"); "failed to add subject name to dictionary");
} }
goto out; goto out;
} }
@ -2985,11 +2986,10 @@ pyconnection_get_peer_x509dict(struct pyconnection *pyc, void *closure)
goto out; goto out;
} }
if (!kore_tls_x509name_foreach(name, 0, subject, if (!kore_tls_x509name_foreach(name, 0, issuer, pyconnection_x509_cb)) {
pyconnection_x509_cb)) {
if (PyErr_Occurred() == NULL) { if (PyErr_Occurred() == NULL) {
PyErr_Format(PyExc_RuntimeError, PyErr_Format(PyExc_RuntimeError,
"failed to add subject name to dictionary"); "failed to add issuer name to dictionary");
} }
goto out; goto out;
} }