update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / seastar / tests / unit / mkcert.gmk

diff --git a/ceph/src/seastar/tests/unit/mkcert.gmk b/ceph/src/seastar/tests/unit/mkcert.gmk
index 829dc4be09c5eb8ac80a0e326012f77f3241a49c..ecf2d5dfeabae2b3a34261721843057c8e4f04a4 100644 (file)
--- a/ceph/src/seastar/tests/unit/mkcert.gmk
+++ b/ceph/src/seastar/tests/unit/mkcert.gmk
@@ -25,6 +25,9 @@ rootkey = ca$(name).key
 config  = $(name).cfg
 days    = 3650
 
+alg    = RSA
+alg_opt = -pkeyopt rsa_keygen_bits:$(width)
+
 hosts   =
 
 all            : $(crt)
@@ -32,21 +35,21 @@ all         : $(crt)
 clean          :
                @rm -f $(crt) $(csr) $(pubkey) $(prvkey)
 
-%.key          :
+%.key          : 
                @echo generating $@
-               openssl genrsa -out $@ $(width) 
+               openssl genpkey -out $@ -algorithm $(alg) $(alg_opt)
 
 %.pub                  : %.key
                @echo generating $@
-               openssl rsa -in $< -out $@
+               openssl pkey -in $< -out $@
 
 $(config)      : $(MAKEFILE_LIST)
                @echo generating $@
                @(                                                                              \
-                       echo RANDFILE = $ENV::HOME/.rnd                                 ;       \
                        echo [ req ]                                                    ;       \
                        echo default_bits = $(width)                                    ;       \
                        echo default_keyfile = $(prvkey)                                  ;       \
+                       echo default_md = sha256 ;      \
                        echo distinguished_name = req_distinguished_name                ;       \
                        echo req_extensions = v3_req                                    ;       \
                        echo prompt = no                                                ;       \