Merge pull request kubernetes#9737 from iterion/use-openssl-rsa

j3ffml · j3ffml · commit e2d496e45d25 · 2015-06-23T10:14:27.000-07:00
AWS: Use RSA to Generate Fingerprint
diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh
@@ -300,7 +300,7 @@ function detect-ubuntu-image () {
 # Hopefully this will be done by the aws cli tool one day: https://github.com/aws/aws-cli/issues/191
 function get-aws-fingerprint {
   local -r pubkey_path=$1
-  ssh-keygen -f ${pubkey_path} -e -m PKCS8  | openssl pkey -pubin -outform DER | openssl md5 -c | sed -e 's/(stdin)= //g'
+  ssh-keygen -f ${pubkey_path} -e -m PKCS8  | openssl rsa -pubin -outform DER | openssl md5 -c | sed -e 's/(stdin)= //g'
 }
 
 # Import an SSH public key to AWS.

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ function detect-ubuntu-image () {`
`300`	`300`	`# Hopefully this will be done by the aws cli tool one day: https://github.com/aws/aws-cli/issues/191`
`301`	`301`	`function get-aws-fingerprint {`
`302`	`302`	`local -r pubkey_path=$1`
`303`		`- ssh-keygen -f ${pubkey_path} -e -m PKCS8 \| openssl pkey -pubin -outform DER \| openssl md5 -c \| sed -e 's/(stdin)= //g'`
	`303`	`+ ssh-keygen -f ${pubkey_path} -e -m PKCS8 \| openssl rsa -pubin -outform DER \| openssl md5 -c \| sed -e 's/(stdin)= //g'`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`# Import an SSH public key to AWS.`