some cleanups here and there

4 files changed, 9 insertions, 13 deletions

diff --git a/src/libstrongswan/asn1/pem.c b/src/libstrongswan/asn1/pem.c
index cb832e189..3a41c5ae4 100755
--- a/src/libstrongswan/asn1/pem.c
+++ b/src/libstrongswan/asn1/pem.c
@@ -303,7 +303,7 @@ bool pem_asn1_load_file(const char *filename, char *passphrase,
 		blob->ptr = malloc(blob->len);
 		bytes = fread(blob->ptr, 1, blob->len, fd);
 		fclose(fd);
-		logger->log(logger, CONTROL, "  loaded %s file '%s' (%d bytes)", type, filename, bytes);
+		logger->log(logger, CONTROL, "  loading %s file '%s' (%d bytes)", type, filename, bytes);
 
 		*pgp = FALSE;
 
diff --git a/src/libstrongswan/crypto/rsa/rsa_private_key.c b/src/libstrongswan/crypto/rsa/rsa_private_key.c
index 689b028d9..13e593bf2 100644
--- a/src/libstrongswan/crypto/rsa/rsa_private_key.c
+++ b/src/libstrongswan/crypto/rsa/rsa_private_key.c
@@ -45,6 +45,12 @@ extern u_int8_t sha512_oid[19];
 
 
 /**
+ * defined in rsa_public_key.c
+ */
+extern chunk_t rsa_public_key_info_to_asn1(const mpz_t n, const mpz_t e);
+
+
+/**
  *  Public exponent to use for key generation.
  */
 #define PUBLIC_EXPONENT 0x10001
diff --git a/src/libstrongswan/crypto/rsa/rsa_public_key.c b/src/libstrongswan/crypto/rsa/rsa_public_key.c
index 40aa08a1a..469f9ea4f 100644
--- a/src/libstrongswan/crypto/rsa/rsa_public_key.c
+++ b/src/libstrongswan/crypto/rsa/rsa_public_key.c
@@ -408,7 +408,8 @@ private_rsa_public_key_t *rsa_public_key_create_empty(void)
 }
 
 /**
- * Build a DER-encoded publicKeyInfo object from an RSA public key
+ * Build a DER-encoded publicKeyInfo object from an RSA public key.
+ * Also used in rsa_private_key.c.
  */
 chunk_t rsa_public_key_info_to_asn1(const mpz_t n, const mpz_t e)
 {
diff --git a/src/libstrongswan/crypto/rsa/rsa_public_key.h b/src/libstrongswan/crypto/rsa/rsa_public_key.h
index 3914d50d4..033995ec7 100644
--- a/src/libstrongswan/crypto/rsa/rsa_public_key.h
+++ b/src/libstrongswan/crypto/rsa/rsa_public_key.h
@@ -163,15 +163,4 @@ rsa_public_key_t *rsa_public_key_create_from_chunk(chunk_t chunk);
  */
 rsa_public_key_t *rsa_public_key_create_from_file(char *filename);
 
-/**
- * @brief Build a DER-encoded publicKeyInfo object from an RSA public key
- * 
- * @param n					modulus n
- * @param e					public exponent
- * @return 					DER-encoded publicKeyInfo object
- * 
- * @ingroup rsa
- */
-chunk_t rsa_public_key_info_to_asn1(const mpz_t n, const mpz_t e);
-
 #endif /*RSA_PUBLIC_KEY_H_*/