diff options
Diffstat (limited to 'util/ntp-keygen.c')
| -rw-r--r-- | util/ntp-keygen.c | 55 |
1 files changed, 35 insertions, 20 deletions
diff --git a/util/ntp-keygen.c b/util/ntp-keygen.c index ff9d6cad8980..c9c0ff9ef75f 100644 --- a/util/ntp-keygen.c +++ b/util/ntp-keygen.c @@ -409,11 +409,11 @@ main( iffkey++; if (HAVE_OPT( MV_PARAMS )) { - mvkey++; + mvkey++; /* DLH are these two swapped? */ nkeys = OPT_VALUE_MV_PARAMS; } if (HAVE_OPT( MV_KEYS )) { - mvpar++; + mvpar++; /* not used! */ /* DLH are these two swapped? */ nkeys = OPT_VALUE_MV_KEYS; } @@ -642,12 +642,13 @@ main( } } if (pkey_gqkey != NULL) { - RSA *rsa; - const BIGNUM *q; + RSA *rsa; + const BIGNUM *q; - rsa = EVP_PKEY_get0_RSA(pkey_gqkey); + rsa = EVP_PKEY_get1_RSA(pkey_gqkey); RSA_get0_factors(rsa, NULL, &q); grpkey = BN_bn2hex(q); + RSA_free(rsa); } /* @@ -664,17 +665,19 @@ main( filename); fprintf(stdout, "# %s\n# %s\n", filename, ctime(&epoch)); - /* XXX: This modifies the private key and should probably use a - * copy of it instead. */ - rsa = EVP_PKEY_get0_RSA(pkey_gqkey); + rsa = EVP_PKEY_get1_RSA(pkey_gqkey); RSA_set0_factors(rsa, BN_dup(BN_value_one()), BN_dup(BN_value_one())); pkey = EVP_PKEY_new(); EVP_PKEY_assign_RSA(pkey, rsa); PEM_write_PKCS8PrivateKey(stdout, pkey, NULL, NULL, 0, NULL, NULL); fflush(stdout); - if (debug) + if (debug) { RSA_print_fp(stderr, rsa, 0); + } + EVP_PKEY_free(pkey); + pkey = NULL; + RSA_free(rsa); } /* @@ -689,14 +692,18 @@ main( filename); fprintf(stdout, "# %s\n# %s\n", filename, ctime(&epoch)); - rsa = EVP_PKEY_get0_RSA(pkey_gqkey); + rsa = EVP_PKEY_get1_RSA(pkey_gqkey); pkey = EVP_PKEY_new(); EVP_PKEY_assign_RSA(pkey, rsa); PEM_write_PKCS8PrivateKey(stdout, pkey, cipher, NULL, 0, NULL, passwd2); fflush(stdout); - if (debug) + if (debug) { RSA_print_fp(stderr, rsa, 0); + } + EVP_PKEY_free(pkey); + pkey = NULL; + RSA_free(rsa); } /* @@ -730,17 +737,19 @@ main( filename); fprintf(stdout, "# %s\n# %s\n", filename, ctime(&epoch)); - /* XXX: This modifies the private key and should probably use a - * copy of it instead. */ - dsa = EVP_PKEY_get0_DSA(pkey_iffkey); + dsa = EVP_PKEY_get1_DSA(pkey_iffkey); DSA_set0_key(dsa, NULL, BN_dup(BN_value_one())); pkey = EVP_PKEY_new(); EVP_PKEY_assign_DSA(pkey, dsa); PEM_write_PKCS8PrivateKey(stdout, pkey, NULL, NULL, 0, NULL, NULL); fflush(stdout); - if (debug) + if (debug) { DSA_print_fp(stderr, dsa, 0); + } + EVP_PKEY_free(pkey); + pkey = NULL; + DSA_free(dsa); } /* @@ -755,14 +764,18 @@ main( filename); fprintf(stdout, "# %s\n# %s\n", filename, ctime(&epoch)); - dsa = EVP_PKEY_get0_DSA(pkey_iffkey); + dsa = EVP_PKEY_get1_DSA(pkey_iffkey); pkey = EVP_PKEY_new(); EVP_PKEY_assign_DSA(pkey, dsa); PEM_write_PKCS8PrivateKey(stdout, pkey, cipher, NULL, 0, NULL, passwd2); fflush(stdout); - if (debug) + if (debug) { DSA_print_fp(stderr, dsa, 0); + } + EVP_PKEY_free(pkey); + pkey = NULL; + DSA_free(dsa); } /* @@ -799,8 +812,9 @@ main( PEM_write_PKCS8PrivateKey(stdout, pkey, NULL, NULL, 0, NULL, NULL); fflush(stdout); - if (debug) + if (debug) { DSA_print_fp(stderr, EVP_PKEY_get0_DSA(pkey), 0); + } } /* @@ -817,8 +831,9 @@ main( PEM_write_PKCS8PrivateKey(stdout, pkey, cipher, NULL, 0, NULL, passwd2); fflush(stdout); - if (debug) + if (debug) { DSA_print_fp(stderr, EVP_PKEY_get0_DSA(pkey), 0); + } } /* @@ -830,7 +845,7 @@ main( fprintf(stderr, "Invalid digest/signature combination %s\n", scheme); - exit (-1); + exit (-1); } x509(pkey_sign, ectx, grpkey, exten, certname); #endif /* AUTOKEY */ |