diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2010-12-11 16:16:47 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2010-12-11 16:16:47 +0100 |
| commit | 77aa416f8ebf36ccdbbe5855ad3fbbfdf7b4724d (patch) | |
| tree | 5ab9bb6ee2f2a59f4be30760584b2b95b14f3ce2 | |
| parent | 0b77a9b4516d588a2026536e2a8cee2b569a1b46 (diff) | |
Cleanup, now we handle certs generated by openssl-1.0
| -rw-r--r-- | skype/README | 5 | ||||
| -rwxr-xr-x | skype/t/livetest-bitlbee.sh | 8 |
2 files changed, 2 insertions, 11 deletions
diff --git a/skype/README b/skype/README index f95da9c5..7b7f12cb 100644 --- a/skype/README +++ b/skype/README @@ -168,11 +168,6 @@ if you used the `--sysconfdir` switch when running bitlbee-skype's `configure`. NOTE: Maybe you want to adjust the permissions in the `~/.skyped` dir. For example make it readable by just your user. -TIP: In case you have difficulties generating `skyped.cert.pem` / -`skyped.key.pem` and you just want to experiment, you can copy&paste the -contents of those files from -http://code.google.com/p/gdata-python-client/source/browse/src/gdata/oauth/rsa.py#87[here]. - - Start `skyped` (the tcp server): ---- diff --git a/skype/t/livetest-bitlbee.sh b/skype/t/livetest-bitlbee.sh index 7592c3ca..dc2f9126 100755 --- a/skype/t/livetest-bitlbee.sh +++ b/skype/t/livetest-bitlbee.sh @@ -23,12 +23,8 @@ rm -rf etc mkdir etc cd etc cp ../../skyped.cnf . -if [ ! -e ~/.skyped/skyped.cert.pem -o ! -e ~/.skyped/skyped.key.pem ]; then - yes ""|openssl req -new -x509 -days 365 -nodes -config skyped.cnf -out skyped.cert.pem -keyout skyped.key.pem 2> openssl.log -else - cp ~/.skyped/skyped.cert.pem . - cp ~/.skyped/skyped.key.pem . -fi +cp ~/.skyped/skyped.cert.pem . +cp ~/.skyped/skyped.key.pem . cd .. echo "[skyped]" > skyped.conf echo "username = $TEST_SKYPE_ID" >> skyped.conf |