Fix some warnings raised by the macOS compiler.

3 files changed, 11 insertions, 11 deletions

diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc
index deed232d..c8daeba0 100644
--- a/src/decrypted_kdm.cc
+++ b/src/decrypted_kdm.cc
@@ -378,16 +378,16 @@ DecryptedKDM::encrypt (
 
 		/* Encrypt using the projector's public key */
 		RSA* rsa = recipient.public_key ();
-		unsigned char encrypted[RSA_size(rsa)];
-		int const encrypted_len = RSA_public_encrypt (p - block, block, encrypted, rsa, RSA_PKCS1_OAEP_PADDING);
+		std::vector<unsigned char> encrypted(RSA_size(rsa));
+		int const encrypted_len = RSA_public_encrypt(p - block, block, encrypted.data(), rsa, RSA_PKCS1_OAEP_PADDING);
 		if (encrypted_len == -1) {
 			throw MiscError (String::compose ("Could not encrypt KDM (%1)", ERR_error_string (ERR_get_error(), 0)));
 		}
 
 		/* Lazy overallocation */
-		char out[encrypted_len * 2];
-		Kumu::base64encode (encrypted, encrypted_len, out, encrypted_len * 2);
-		int const N = strlen (out);
+		vector<char> out(encrypted_len * 2);
+		Kumu::base64encode(encrypted.data(), encrypted_len, out.data(), encrypted_len * 2);
+		int const N = strlen(out.data());
 		string lines;
 		for (int i = 0; i < N; ++i) {
 			if (i > 0 && (i % 64) == 0) {
diff --git a/src/key.cc b/src/key.cc
index a5e92aac..f11f6323 100644
--- a/src/key.cc
+++ b/src/key.cc
@@ -108,9 +108,9 @@ Key::operator= (Key const & other)
 string
 Key::hex () const
 {
-	char buffer[_length * 2 + 1];
+	std::vector<char> buffer(_length * 2 + 1);
 
-	char* p = buffer;
+	char* p = buffer.data();
 	for (int i = 0; i < _length; ++i) {
 #ifdef LIBDCP_WINDOWS
 		__mingw_snprintf (p, 3, "%02hhx", _value[i]);
@@ -120,7 +120,7 @@ Key::hex () const
 		p += 2;
 	}
 
-	return buffer;
+	return string(buffer.data());
 }
 
 
diff --git a/src/util.cc b/src/util.cc
index 11fcda27..8ad90dbf 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -200,15 +200,15 @@ dcp::base64_decode (string const & in, unsigned char* out, int out_length)
 	BIO_set_flags (b64, BIO_FLAGS_BASE64_NO_NL);
 
 	/* Copy our input string, removing newlines */
-	char in_buffer[in.size() + 1];
-	char* p = in_buffer;
+	vector<char> in_buffer(in.size() + 1);
+	char* p = in_buffer.data();
 	for (size_t i = 0; i < in.size(); ++i) {
 		if (in[i] != '\n' && in[i] != '\r') {
 			*p++ = in[i];
 		}
 	}
 
-	auto bmem = BIO_new_mem_buf (in_buffer, p - in_buffer);
+	auto bmem = BIO_new_mem_buf(in_buffer.data(), p - in_buffer.data());
 	bmem = BIO_push (b64, bmem);
 	int const N = BIO_read (bmem, out, out_length);
 	BIO_free_all (bmem);