From d5349a522a0d9b06b98bf0618115fc0dcde72278 Mon Sep 17 00:00:00 2001 From: Scott Baker Date: Thu, 13 Nov 2008 21:07:50 +0000 Subject: [PATCH] updated for fc8, dynamic linking --- keyconvert/Makefile | 2 +- keyconvert/keyconvert.c | 1 + keyconvert/keyconvertmain.c | 2 ++ keyconvert/test.sh | 33 ++++++++++++++++++++++++++ keyconvert/test.txt | 1 + keyconvert/test/openssh_dsa_1024 | 12 ++++++++++ keyconvert/test/openssh_dsa_1024.pub | 1 + keyconvert/test/openssh_dsa_2048 | 20 ++++++++++++++++ keyconvert/test/openssh_dsa_2048.pub | 1 + keyconvert/test/openssh_dsa_512 | 8 +++++++ keyconvert/test/openssh_dsa_512.pub | 1 + keyconvert/test/openssh_rsa1_1024 | Bin 0 -> 529 bytes keyconvert/test/openssh_rsa1_1024.pub | 1 + keyconvert/test/openssh_rsa1_2048 | Bin 0 -> 977 bytes keyconvert/test/openssh_rsa1_2048.pub | 1 + keyconvert/test/openssh_rsa1_512 | Bin 0 -> 305 bytes keyconvert/test/openssh_rsa1_512.pub | 1 + keyconvert/test/openssh_rsa_1024 | 15 ++++++++++++ keyconvert/test/openssh_rsa_1024.pub | 1 + keyconvert/test/openssh_rsa_2048 | 27 +++++++++++++++++++++ keyconvert/test/openssh_rsa_2048.pub | 1 + keyconvert/test/openssh_rsa_512 | 9 +++++++ keyconvert/test/openssh_rsa_512.pub | 1 + keyconvert/testkey.sh | 6 +++++ 24 files changed, 144 insertions(+), 1 deletion(-) create mode 100755 keyconvert/test.sh create mode 100644 keyconvert/test.txt create mode 100644 keyconvert/test/openssh_dsa_1024 create mode 100644 keyconvert/test/openssh_dsa_1024.pub create mode 100644 keyconvert/test/openssh_dsa_2048 create mode 100644 keyconvert/test/openssh_dsa_2048.pub create mode 100644 keyconvert/test/openssh_dsa_512 create mode 100644 keyconvert/test/openssh_dsa_512.pub create mode 100644 keyconvert/test/openssh_rsa1_1024 create mode 100644 keyconvert/test/openssh_rsa1_1024.pub create mode 100644 keyconvert/test/openssh_rsa1_2048 create mode 100644 keyconvert/test/openssh_rsa1_2048.pub create mode 100644 keyconvert/test/openssh_rsa1_512 create mode 100644 keyconvert/test/openssh_rsa1_512.pub create mode 100644 keyconvert/test/openssh_rsa_1024 create mode 100644 keyconvert/test/openssh_rsa_1024.pub create mode 100644 keyconvert/test/openssh_rsa_2048 create mode 100644 keyconvert/test/openssh_rsa_2048.pub create mode 100644 keyconvert/test/openssh_rsa_512 create mode 100644 keyconvert/test/openssh_rsa_512.pub create mode 100755 keyconvert/testkey.sh diff --git a/keyconvert/Makefile b/keyconvert/Makefile index eda3f9b7..917831e0 100644 --- a/keyconvert/Makefile +++ b/keyconvert/Makefile @@ -1,5 +1,5 @@ keyconvert: - gcc -o keyconvert keyconvert.c keyconvertmain.c b64decode.c /usr/lib/libcrypto.a + gcc -o keyconvert -lcrypto -ldl keyconvert.c keyconvertmain.c b64decode.c clean: rm -rf keyconvert diff --git a/keyconvert/keyconvert.c b/keyconvert/keyconvert.c index b2fdfd1b..55dd79c1 100644 --- a/keyconvert/keyconvert.c +++ b/keyconvert/keyconvert.c @@ -1,4 +1,5 @@ #include +#include #include #include #include diff --git a/keyconvert/keyconvertmain.c b/keyconvert/keyconvertmain.c index d59dba8b..63322957 100644 --- a/keyconvert/keyconvertmain.c +++ b/keyconvert/keyconvertmain.c @@ -1,4 +1,6 @@ +#include #include +#include #include "keyconvert.h" #include "b64decode.h" diff --git a/keyconvert/test.sh b/keyconvert/test.sh new file mode 100755 index 00000000..34fc7c2f --- /dev/null +++ b/keyconvert/test.sh @@ -0,0 +1,33 @@ +# this scripts tests the key conversion routines +# it converts the _pub files in test/ from openssh to openssl +# it then verifies signatures with openssl (see keytest.sh) + +rm -rf testout +mkdir testout + +# rsa1 keys +# these are in a different format +#./keyconvert test/openssh_rsa1_512.pub testout/openssl_rsa1_512.pem +#./keyconvert test/openssh_rsa1_1024.pub testout/openssl_rsa1_1024.pem +#./keyconvert test/openssh_rsa1_2048.pub testout/openssl_rsa1_2048.pem + +# rsa2 keys +./keyconvert test/openssh_rsa_512.pub testout/openssl_rsa_512.pem +./keyconvert test/openssh_rsa_1024.pub testout/openssl_rsa_1024.pem +./keyconvert test/openssh_rsa_2048.pub testout/openssl_rsa_2048.pem + +# dsa keys +./keyconvert test/openssh_dsa_512.pub testout/openssl_dsa_512.pem +./keyconvert test/openssh_dsa_1024.pub testout/openssl_dsa_1024.pem +./keyconvert test/openssh_dsa_2048.pub testout/openssl_dsa_2048.pem + +# make a test file to encrypt +echo "this is a test to see if the key conversion routines work" > test.txt + +# test the keys +./testkey.sh -sha1 rsa_512 +./testkey.sh -sha1 rsa_1024 +./testkey.sh -sha1 rsa_2048 +./testkey.sh -dss1 dsa_512 +./testkey.sh -dss1 dsa_1024 +./testkey.sh -dss1 dsa_2048 diff --git a/keyconvert/test.txt b/keyconvert/test.txt new file mode 100644 index 00000000..0bd7ba19 --- /dev/null +++ b/keyconvert/test.txt @@ -0,0 +1 @@ +this is a test to see if the key conversion routines work diff --git a/keyconvert/test/openssh_dsa_1024 b/keyconvert/test/openssh_dsa_1024 new file mode 100644 index 00000000..f6c3f7db --- /dev/null +++ b/keyconvert/test/openssh_dsa_1024 @@ -0,0 +1,12 @@ +-----BEGIN DSA PRIVATE KEY----- +MIIBvQIBAAKBgQDx32kPfS+uiVq6pqgEGORLZx0EfSXvlluD/nKtLQoBxDY7JntP +oVyI29KPVSnsjqEAVI7r9pEJ/aszrc4jLj5dbjqehLF5qnkrr/XAcTv4MsxKuyDy +6R0AhU91YrkChO8JedxbUdf6lI3DLREaRIvLhHew05k34W0dGdEV/U/hvQIVANT3 +PYXSBKIShJovHfC4YQ65kOy3AoGBANs/BTSWWUEs3jppa65VZV/8WbV7Q3uV9PVu +Ljf6E9DKFI5PPbJOMPbX7XF3zrCRtiTVl1dTc/xH7LYXvHTVU469mRpdNDwCMF5r +y1bWbVVKhIrcrlVnEF3+up2jD7Xu+tfIn/YmJyrHhvKV842HLv+LAbUJbMQ/9POt +5w9RufrNAoGBAJYsrPd4VhUQwTzWW/LQmIevjT/X5T2putWXttsZ1KzMP2qi9rf8 +GATnPJahYq1DXgNSPcqIHF5FUgVEITJ3R/CTCFiKF/+N5yBzEXmbo+HGG8W1hKnp +QdzVKZq0esGwEKfkZ0lUPJCh5IYyRL8ceh8KRjEFSKuSEPZqwrngklw0AhUAg8tD +T7VLBFkDCC7bhsKqFkJ4AAo= +-----END DSA PRIVATE KEY----- diff --git a/keyconvert/test/openssh_dsa_1024.pub b/keyconvert/test/openssh_dsa_1024.pub new file mode 100644 index 00000000..d81b006a --- /dev/null +++ b/keyconvert/test/openssh_dsa_1024.pub @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAACBAPHfaQ99L66JWrqmqAQY5EtnHQR9Je+WW4P+cq0tCgHENjsme0+hXIjb0o9VKeyOoQBUjuv2kQn9qzOtziMuPl1uOp6EsXmqeSuv9cBxO/gyzEq7IPLpHQCFT3ViuQKE7wl53FtR1/qUjcMtERpEi8uEd7DTmTfhbR0Z0RX9T+G9AAAAFQDU9z2F0gSiEoSaLx3wuGEOuZDstwAAAIEA2z8FNJZZQSzeOmlrrlVlX/xZtXtDe5X09W4uN/oT0MoUjk89sk4w9tftcXfOsJG2JNWXV1Nz/Efsthe8dNVTjr2ZGl00PAIwXmvLVtZtVUqEityuVWcQXf66naMPte7618if9iYnKseG8pXzjYcu/4sBtQlsxD/0863nD1G5+s0AAACBAJYsrPd4VhUQwTzWW/LQmIevjT/X5T2putWXttsZ1KzMP2qi9rf8GATnPJahYq1DXgNSPcqIHF5FUgVEITJ3R/CTCFiKF/+N5yBzEXmbo+HGG8W1hKnpQdzVKZq0esGwEKfkZ0lUPJCh5IYyRL8ceh8KRjEFSKuSEPZqwrngklw0 smbaker@test64 diff --git a/keyconvert/test/openssh_dsa_2048 b/keyconvert/test/openssh_dsa_2048 new file mode 100644 index 00000000..b43eb653 --- /dev/null +++ b/keyconvert/test/openssh_dsa_2048 @@ -0,0 +1,20 @@ +-----BEGIN DSA PRIVATE KEY----- +MIIDPgIBAAKCAQEAhvJpPI7AbHEyXauGmXyCGsVCkTXD4i9b/eobbwG1Hhm8FvtM +wq5oopWItMH0HMcKfBGmHlp46u5KJcYmrSsHSDX+6n9+Mw/Pn2Sldg26OTkyfsaV +qelapH0Q3ILt8fTrHosy9aosBiZbu4wPdjiBs441ekhGpZfsdaa3g657VGSG1YqH +S/eMw7fs068Vsp5ickYCapI+XICFnf2lQesC4gfElDRGOG3/6n0Pkhsw0TwXRgka +GgXfxHR4CPIlH7fV1/QIYXLXRU8ftkrwakIltSrl50pQOXDuCOGR49ng2JaxFdWv +sjUundZsmnWjGFFE2ORrTBFHagmwOsQXY4vOXwIVAJtUPdFxKVNC2t89reLuOGao +FFxJAoIBAQCAZYog0D72F0TIAIMIahnDDNjN2T3Sb3Zqhd27oExdUpbNDbM8F+qY +HpqJRtQRc59sSsroif+K0yEaeReOapEb6Cf1N4yGDppr1ClMBGHKk/Wsjf/ASqa8 +/mibtSF4P5I6e0w8FWrTrhu2vJ9W2ONRqVAUxgBMsEKXFXvkYtf31LKsQFUEcmtO +uXalXiKAdr+APQya6lDiUxGELjuNzwsGxjdo15wa6NcKLfHUv3XYU6WxL2USGFBW +5I1aHu/Uc7YGhl2I9fSulzotEc4PV40nlC54NVx65pQjeViJ4ZSSlrSm58xxfrdF +TnWvEJjSu6CAFYfWEzx5RtbjuWMk6yAdAoIBAFx7TsT+G3sryKRs4DRWSSlU8PAO +2I326UJps4CiiAS6x6XGnB9kLX3E/xfdmM9mrhQBNn0OPo5iCK2me1W2sXQ6QWD/ +dRhKwIcrHVexwu5iMtoMtMAeDI5P7/ahVSIxDAKkABD4hDJB3UcTDYXaz1/bNqW6 +FXYK2C9CrfhYF3NX28MU+eJhIFRpEaVU42bQ5OeDaJiz2tQeSrT5LqbV58RhARew +9tK1FOCBTBsJ+bBr4Q5f9bFNpSqqn513H/cc6qkuRCluxeGTAtNt5qdHYH+rvxey +FpBzy8MmXkHxsQWxZ1DAkaUgPaxXevNQRk/iNsk1W3zWqJ72KI5lNFgJ9yECFA/o +gWjBm06JTkYWBOgkYRRVRzr7 +-----END DSA PRIVATE KEY----- diff --git a/keyconvert/test/openssh_dsa_2048.pub b/keyconvert/test/openssh_dsa_2048.pub new file mode 100644 index 00000000..69d00b60 --- /dev/null +++ b/keyconvert/test/openssh_dsa_2048.pub @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAAEBAIbyaTyOwGxxMl2rhpl8ghrFQpE1w+IvW/3qG28BtR4ZvBb7TMKuaKKViLTB9BzHCnwRph5aeOruSiXGJq0rB0g1/up/fjMPz59kpXYNujk5Mn7GlanpWqR9ENyC7fH06x6LMvWqLAYmW7uMD3Y4gbOONXpIRqWX7HWmt4Oue1RkhtWKh0v3jMO37NOvFbKeYnJGAmqSPlyAhZ39pUHrAuIHxJQ0Rjht/+p9D5IbMNE8F0YJGhoF38R0eAjyJR+31df0CGFy10VPH7ZK8GpCJbUq5edKUDlw7gjhkePZ4NiWsRXVr7I1Lp3WbJp1oxhRRNjka0wRR2oJsDrEF2OLzl8AAAAVAJtUPdFxKVNC2t89reLuOGaoFFxJAAABAQCAZYog0D72F0TIAIMIahnDDNjN2T3Sb3Zqhd27oExdUpbNDbM8F+qYHpqJRtQRc59sSsroif+K0yEaeReOapEb6Cf1N4yGDppr1ClMBGHKk/Wsjf/ASqa8/mibtSF4P5I6e0w8FWrTrhu2vJ9W2ONRqVAUxgBMsEKXFXvkYtf31LKsQFUEcmtOuXalXiKAdr+APQya6lDiUxGELjuNzwsGxjdo15wa6NcKLfHUv3XYU6WxL2USGFBW5I1aHu/Uc7YGhl2I9fSulzotEc4PV40nlC54NVx65pQjeViJ4ZSSlrSm58xxfrdFTnWvEJjSu6CAFYfWEzx5RtbjuWMk6yAdAAABAFx7TsT+G3sryKRs4DRWSSlU8PAO2I326UJps4CiiAS6x6XGnB9kLX3E/xfdmM9mrhQBNn0OPo5iCK2me1W2sXQ6QWD/dRhKwIcrHVexwu5iMtoMtMAeDI5P7/ahVSIxDAKkABD4hDJB3UcTDYXaz1/bNqW6FXYK2C9CrfhYF3NX28MU+eJhIFRpEaVU42bQ5OeDaJiz2tQeSrT5LqbV58RhARew9tK1FOCBTBsJ+bBr4Q5f9bFNpSqqn513H/cc6qkuRCluxeGTAtNt5qdHYH+rvxeyFpBzy8MmXkHxsQWxZ1DAkaUgPaxXevNQRk/iNsk1W3zWqJ72KI5lNFgJ9yE= smbaker@test64 diff --git a/keyconvert/test/openssh_dsa_512 b/keyconvert/test/openssh_dsa_512 new file mode 100644 index 00000000..003f01c0 --- /dev/null +++ b/keyconvert/test/openssh_dsa_512 @@ -0,0 +1,8 @@ +-----BEGIN DSA PRIVATE KEY----- +MIH4AgEAAkEAm3PK+DSgbavp8uFzwHkLBQkAQ+zYH7oQQfVf9qfj9McPwPSRjyE2 +euX37kG9V+8fMYGkrXiAnTF338/7l/BitQIVAPhdznYDxCFE+K7Fkmric3uRLhKl +AkASi9+yBXkSh/PBIB2VTwUNJ2Je2rMT/KArLw86dQuMdV2QPnCI4jwvFeWJW8q1 +CSKyBcwoxaSwPN6MAYNRLmPtAkA/5M4TgOWQjoUDc1DwwAFzl8kXc8Jywyz3Ck1a +uCgs+unOttuDT+ZYicDRSnq7G3paTGm5U9h3Pf4BOzqKymxmAhUAsvh3vpJX52p7 +WTaXKaBm7ysblAE= +-----END DSA PRIVATE KEY----- diff --git a/keyconvert/test/openssh_dsa_512.pub b/keyconvert/test/openssh_dsa_512.pub new file mode 100644 index 00000000..a4a4f6ed --- /dev/null +++ b/keyconvert/test/openssh_dsa_512.pub @@ -0,0 +1 @@ +ssh-dss AAAAB3NzaC1kc3MAAABBAJtzyvg0oG2r6fLhc8B5CwUJAEPs2B+6EEH1X/an4/THD8D0kY8hNnrl9+5BvVfvHzGBpK14gJ0xd9/P+5fwYrUAAAAVAPhdznYDxCFE+K7Fkmric3uRLhKlAAAAQBKL37IFeRKH88EgHZVPBQ0nYl7asxP8oCsvDzp1C4x1XZA+cIjiPC8V5YlbyrUJIrIFzCjFpLA83owBg1EuY+0AAABAP+TOE4DlkI6FA3NQ8MABc5fJF3PCcsMs9wpNWrgoLPrpzrbbg0/mWInA0Up6uxt6WkxpuVPYdz3+ATs6ispsZg== smbaker@test64 diff --git a/keyconvert/test/openssh_rsa1_1024 b/keyconvert/test/openssh_rsa1_1024 new file mode 100644 index 0000000000000000000000000000000000000000..1d814be45b6b0442fb7334ee848964120fb024c9 GIT binary patch literal 529 zcmV+s0`C1&Q%E3CQb|@pR7D_5MOh$5NlZl`Mo&^rK~x|yE-?xK000000000400aQI z^#g@OwPen0@MsoYThI?0S3ra0f0E_+=DgNnI`E*W*x;4#I@&~=%2=Q8X-LNA%(!It z=NN?ZEv@osF0u(5Qrc3(K%QGs6R&ovcffIr-5?J+Hh_CrTHVw)s<(`BXRto9;fOKOMEkc=KP95eSZ=jR1+pieW)$IQ*vT5h|HOehC~3La%RO_-=6B zKhIcwvhTYaas>;4vv^Idr9rj*(Vw?G5KG{q20szcH^U^-UXGSf&o@pbt zv+veRSA6tD;_9;_TkayTsEG2~V<92|uml>Qo?2e}$;fXgl4I|NG0~Rg!Ue|^3jEh1DuBuy4TQft2)KntD TAwx?(#~E|#6wS8{00000Z71}J literal 0 HcmV?d00001 diff --git a/keyconvert/test/openssh_rsa1_1024.pub b/keyconvert/test/openssh_rsa1_1024.pub new file mode 100644 index 00000000..8e8d3089 --- /dev/null +++ b/keyconvert/test/openssh_rsa1_1024.pub @@ -0,0 +1 @@ +1024 35 129881281989970257849297143265405883841808716551531717161470388680233069834806491515662719447667414192316994820475038514678885956467447964923197868990351993958234384078203216494595575140725420329195654521080877033819243506183873392482029450927674981321293693168525102276485740189208563187461931348496284073193 smbaker@test64 diff --git a/keyconvert/test/openssh_rsa1_2048 b/keyconvert/test/openssh_rsa1_2048 new file mode 100644 index 0000000000000000000000000000000000000000..adf13a28e55695e29d05e9e18e39559eb42bf128 GIT binary patch literal 977 zcmV;?11|hiQ%E3CQb|@pR7D_5MOh$5NlZl`Mo&^rK~x|yE-?xK000000000800;oZ zy#{v$u>d>7cB5#zvldqppecA>uMu_7*oc>KfA@i=4%8ko+`u!uk!W@bm91OUfqDyyjY zg`sJ@Z$uHu)Rr)HQt9Q1rBsYaZ6^kg3fe|NW0&{EJ&@@BPkZZ6u^;sfnpu>~6+%`NDGkjFpVXFXg!nRC zmgBBR>HJTH>PQ|KlSjF4U-bk4{oA4br@q8BV9MCcUU}Z9`e83S!bv%zhe`xR{Qp1`kE2w>y$d>#Ab@wN(OB<|_ZvM;P<&DEhy<95C=1A{2e7CRxXLMu{iFRh5E!{D}oKlhFHET}{?BR`-or5f20#cPFop+3nmY60Ra4Ao17ZsA_MUcw`3X3XnxiC z9tb^qxyV8+C^H=do|6Fp{P`A>JD#66EP signature.bin +openssl dgst $1 -signature signature.bin -verify testout/openssl_$2.pem test.txt +rm -rf signature.bin -- 2.43.0