X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=openssl.c;h=9d3ad577da4f5636f409fbacb0f1433ca0c720e1;hb=539d39f36549c10656d8b31f3dea32702e9649df;hp=bda5791fc51d1095a6115ecd5c0476852f517a5e;hpb=0b8b2469b5d2b81ff928bddd10d4ac3b819b75f8;p=paraslash.git

diff --git a/openssl.c b/openssl.c
index bda5791f..9d3ad577 100644
--- a/openssl.c
+++ b/openssl.c
@@ -57,7 +57,15 @@ void crypt_init(void)
 
 void crypt_shutdown(void)
 {
+#ifdef HAVE_CRYPTO_CLEANUP_ALL_EX_DATA
 	CRYPTO_cleanup_all_ex_data();
+#endif
+#ifdef HAVE_OPENSSL_THREAD_STOP /* openssl-1.1 or later */
+	OPENSSL_thread_stop();
+#else /* openssl-1.0 */
+	ERR_remove_thread_state(NULL);
+#endif
+	EVP_cleanup();
 }
 
 /*
@@ -124,7 +132,7 @@ free_rsa:
 	return ret;
 }
 
-static int get_private_key(const char *path, RSA **rsa)
+static int read_pem_private_key(const char *path, RSA **rsa)
 {
 	EVP_PKEY *pkey;
 	BIO *bio = BIO_new(BIO_s_file());
@@ -144,12 +152,138 @@ bio_free:
 	return *rsa? RSA_size(*rsa) : -E_PRIVATE_KEY;
 }
 
+static int read_private_rsa_params(const unsigned char *blob,
+		const unsigned char *end, RSA **result)
+{
+	int ret;
+	RSA *rsa;
+	BN_CTX *ctx;
+	BIGNUM *n, *e, *d, *iqmp, *p, *q; /* stored in the key file */
+	BIGNUM *dmp1, *dmq1; /* these will be computed */
+	BIGNUM *tmp;
+	const unsigned char *cp = blob;
+
+	rsa = RSA_new();
+	if (!rsa)
+		return -E_BIGNUM;
+	ret = -E_BIGNUM;
+	tmp = BN_new();
+	if (!tmp)
+		goto free_rsa;
+	ctx = BN_CTX_new();
+	if (!ctx)
+		goto free_tmp;
+	dmp1 = BN_new();
+	if (!dmp1)
+		goto free_ctx;
+	dmq1 = BN_new();
+	if (!dmq1)
+		goto free_dmp1;
+	ret = read_bignum(cp, end - cp, &n);
+	if (ret < 0)
+		goto free_dmq1;
+	cp += ret;
+	ret = read_bignum(cp, end - cp, &e);
+	if (ret < 0)
+		goto free_n;
+	cp += ret;
+	ret = read_bignum(cp, end - cp, &d);
+	if (ret < 0)
+		goto free_e;
+	cp += ret;
+	ret = read_bignum(cp, end - cp, &iqmp);
+	if (ret < 0)
+		goto free_d;
+	cp += ret;
+	ret = read_bignum(cp, end - cp, &p);
+	if (ret < 0)
+		goto free_iqmp;
+	cp += ret;
+	ret = read_bignum(cp, end - cp, &q);
+	if (ret < 0)
+		goto free_p;
+	ret = -E_BIGNUM;
+	if (!BN_sub(tmp, q, BN_value_one()))
+		goto free_q;
+	if (!BN_mod(dmp1, d, tmp, ctx))
+		goto free_q;
+	if (!BN_sub(tmp, q, BN_value_one()))
+		goto free_q;
+	if (!BN_mod(dmq1, d, tmp, ctx))
+		goto free_q;
+#ifdef HAVE_RSA_SET0_KEY
+	RSA_set0_key(rsa, n, e, d);
+	RSA_set0_factors(rsa, p, q);
+	RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp);
+#else
+	rsa->n = n;
+	rsa->e = e;
+	rsa->d = d;
+	rsa->p = p;
+	rsa->q = q;
+	rsa->dmp1 = dmp1;
+	rsa->dmq1 = dmq1;
+	rsa->iqmp = iqmp;
+#endif
+	*result = rsa;
+	ret = 1;
+	goto free_ctx;
+free_q:
+	BN_clear_free(q);
+free_p:
+	BN_clear_free(p);
+free_iqmp:
+	BN_clear_free(iqmp);
+free_d:
+	BN_clear_free(d);
+free_e:
+	BN_free(e);
+free_n:
+	BN_free(n);
+free_dmq1:
+	BN_clear_free(dmq1);
+free_dmp1:
+	BN_clear_free(dmp1);
+free_ctx:
+	BN_CTX_free(ctx);
+free_tmp:
+	BN_clear_free(tmp);
+free_rsa:
+	if (ret < 0)
+		RSA_free(rsa);
+	return ret;
+}
+
+static int get_private_key(const char *path, RSA **rsa)
+{
+	int ret;
+	unsigned char *blob, *end;
+	size_t blob_size;
+
+	*rsa = NULL;
+	ret = decode_private_key(path, &blob, &blob_size);
+	if (ret < 0)
+		return ret;
+	end = blob + blob_size;
+	if (ret == PKT_OPENSSH) {
+		ret = find_openssh_bignum_offset(blob, blob_size);
+		if (ret < 0)
+			goto free_blob;
+		PARA_INFO_LOG("reading RSA params at offset %d\n", ret);
+		ret = read_private_rsa_params(blob + ret, end, rsa);
+	} else
+		ret = read_pem_private_key(path, rsa);
+free_blob:
+	free(blob);
+	return ret;
+}
+
 int apc_get_pubkey(const char *key_file, struct asymmetric_key **result)
 {
 	unsigned char *blob;
 	size_t decoded_size;
 	int ret;
-	struct asymmetric_key *key = para_malloc(sizeof(*key));
+	struct asymmetric_key *key = alloc(sizeof(*key));
 
 	ret = decode_public_key(key_file, &blob, &decoded_size);
 	if (ret < 0)
@@ -190,7 +324,7 @@ int apc_priv_decrypt(const char *key_file, unsigned char *outbuf,
 		return ret;
 	if (inlen < 0)
 		return -E_RSA;
-	priv = para_malloc(sizeof(*priv));
+	priv = alloc(sizeof(*priv));
 	ret = get_private_key(key_file, &priv->rsa);
 	if (ret < 0) {
 		free(priv);
@@ -232,7 +366,7 @@ struct stream_cipher {
 
 struct stream_cipher *sc_new(const unsigned char *data, int len)
 {
-	struct stream_cipher *sc = para_malloc(sizeof(*sc));
+	struct stream_cipher *sc = alloc(sizeof(*sc));
 
 	assert(len >= 2 * AES_CRT128_BLOCK_SIZE);
 	sc->aes = EVP_CIPHER_CTX_new();
@@ -256,7 +390,7 @@ static void aes_ctr128_crypt(EVP_CIPHER_CTX *ctx, struct iovec *src,
 
 	*dst = (typeof(*dst)) {
 		/* Add one for the terminating zero byte. */
-		.iov_base = para_malloc(inlen + 1),
+		.iov_base = alloc(inlen + 1),
 		.iov_len = inlen
 	};
 	ret = EVP_EncryptUpdate(ctx, dst->iov_base, &outlen, src->iov_base, inlen);
@@ -280,3 +414,11 @@ void hash_function(const char *data, unsigned long len, unsigned char *hash)
 	SHA1_Update(&c, data, len);
 	SHA1_Final(hash, &c);
 }
+
+void hash2_function(const char *data, unsigned long len, unsigned char *hash)
+{
+	SHA256_CTX c;
+	SHA256_Init(&c);
+	SHA256_Update(&c, data, len);
+	SHA256_Final(hash, &c);
+}