Skip to content

Commit acaeb4a

Browse files
Correct public key naming in pem utils (#721)
1 parent 6c90e49 commit acaeb4a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

include/aws/io/pem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ enum aws_pem_object_type {
2222
AWS_PEM_TYPE_X509_REQ, /* CERTIFICATE REQUEST */
2323
AWS_PEM_TYPE_X509_CRL, /* X509 CRL */
2424
AWS_PEM_TYPE_EVP_PKEY, /* ANY PRIVATE KEY */
25-
AWS_PEM_TYPE_PUBLIC_PKCS8, /* PUBLIC KEY */
25+
AWS_PEM_TYPE_PUBLIC_KEY, /* PUBLIC KEY */
2626
AWS_PEM_TYPE_PRIVATE_RSA_PKCS1, /* RSA PRIVATE KEY */
2727
AWS_PEM_TYPE_PUBLIC_RSA_PKCS1, /* RSA PUBLIC KEY */
2828
AWS_PEM_TYPE_PRIVATE_DSA_PKCS1, /* RSA PRIVATE KEY */

source/pem.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ static struct aws_byte_cursor s_pem_type_x509_req_old_cur =
114114
static struct aws_byte_cursor s_pem_type_x509_req_cur = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("CERTIFICATE REQUEST");
115115
static struct aws_byte_cursor s_pem_type_x509_crl_cur = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("X509 CRL");
116116
static struct aws_byte_cursor s_pem_type_evp_pkey_cur = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("ANY PRIVATE KEY");
117-
static struct aws_byte_cursor s_pem_type_public_pkcs8_cur = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("PUBLIC KEY");
117+
static struct aws_byte_cursor s_pem_type_public_key_cur = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("PUBLIC KEY");
118118
static struct aws_byte_cursor s_pem_type_private_rsa_pkcs1_cur =
119119
AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("RSA PRIVATE KEY");
120120
static struct aws_byte_cursor s_pem_type_public_rsa_pkcs1_cur = AWS_BYTE_CUR_INIT_FROM_STRING_LITERAL("RSA PUBLIC KEY");
@@ -178,8 +178,8 @@ enum aws_pem_object_type s_map_type_cur_to_type(struct aws_byte_cursor type_cur)
178178
return AWS_PEM_TYPE_X509_CRL;
179179
} else if (aws_byte_cursor_eq(&type_cur, &s_pem_type_evp_pkey_cur)) {
180180
return AWS_PEM_TYPE_EVP_PKEY;
181-
} else if (aws_byte_cursor_eq(&type_cur, &s_pem_type_public_pkcs8_cur)) {
182-
return AWS_PEM_TYPE_PUBLIC_PKCS8;
181+
} else if (aws_byte_cursor_eq(&type_cur, &s_pem_type_public_key_cur)) {
182+
return AWS_PEM_TYPE_PUBLIC_KEY;
183183
} else if (aws_byte_cursor_eq(&type_cur, &s_pem_type_private_rsa_pkcs1_cur)) {
184184
return AWS_PEM_TYPE_PRIVATE_RSA_PKCS1;
185185
} else if (aws_byte_cursor_eq(&type_cur, &s_pem_type_public_rsa_pkcs1_cur)) {

0 commit comments

Comments
 (0)