level_string, msg) >= 0;
}
-/*
- * auxiliary function for incrementally reporting texts via the error queue
- */
-static void put_error(int lib, const char *func, int reason,
- const char *file, int line)
-{
- ERR_new();
- ERR_set_debug(file, line, func);
- ERR_set_error(lib, reason, NULL /* no data here, so fmt is NULL */);
-}
-
-#define ERR_print_errors_cb_LIMIT 4096 /* size of char buf[] variable there */
-#define TYPICAL_MAX_OUTPUT_BEFORE_DATA 100
-#define MAX_DATA_LEN (ERR_print_errors_cb_LIMIT-TYPICAL_MAX_OUTPUT_BEFORE_DATA)
-void ossl_cmp_add_error_txt(const char *separator, const char *txt)
-{
- const char *file = NULL;
- int line;
- const char *func = NULL;
- const char *data = NULL;
- int flags;
- unsigned long err = ERR_peek_last_error();
-
- if (separator == NULL)
- separator = "";
- if (err == 0)
- put_error(ERR_LIB_CMP, NULL, 0, "", 0);
-
- do {
- size_t available_len, data_len;
- const char *curr = txt, *next = txt;
- char *tmp;
-
- ERR_peek_last_error_all(&file, &line, &func, &data, &flags);
- if ((flags & ERR_TXT_STRING) == 0) {
- data = "";
- separator = "";
- }
- data_len = strlen(data);
-
- /* workaround for limit of ERR_print_errors_cb() */
- if (data_len >= MAX_DATA_LEN
- || strlen(separator) >= (size_t)(MAX_DATA_LEN - data_len))
- available_len = 0;
- else
- available_len = MAX_DATA_LEN - data_len - strlen(separator) - 1;
- /* MAX_DATA_LEN > available_len >= 0 */
-
- if (separator[0] == '\0') {
- const size_t len_next = strlen(next);
-
- if (len_next <= available_len) {
- next += len_next;
- curr = NULL; /* no need to split */
- }
- else {
- next += available_len;
- curr = next; /* will split at this point */
- }
- } else {
- while (*next != '\0' && (size_t)(next - txt) <= available_len) {
- curr = next;
- next = strstr(curr, separator);
- if (next != NULL)
- next += strlen(separator);
- else
- next = curr + strlen(curr);
- }
- if ((size_t)(next - txt) <= available_len)
- curr = NULL; /* the above loop implies *next == '\0' */
- }
- if (curr != NULL) {
- /* split error msg at curr since error data would get too long */
- if (curr != txt) {
- tmp = OPENSSL_strndup(txt, curr - txt);
- if (tmp == NULL)
- return;
- ERR_add_error_data(2, separator, tmp);
- OPENSSL_free(tmp);
- }
- put_error(ERR_LIB_CMP, func, err, file, line);
- txt = curr;
- } else {
- ERR_add_error_data(2, separator, txt);
- txt = next; /* finished */
- }
- } while (*txt != '\0');
-}
-
+#define ERR_PRINT_BUF_SIZE 4096
/* this is similar to ERR_print_errors_cb, but uses the CMP-specific cb type */
void OSSL_CMP_print_errors_cb(OSSL_cmp_log_cb_t log_fn)
{
unsigned long err;
- char msg[ERR_print_errors_cb_LIMIT];
+ char msg[ERR_PRINT_BUF_SIZE];
const char *file = NULL, *func = NULL, *data = NULL;
int line, flags;
return 1;
}
-STACK_OF(X509) *ossl_cmp_X509_STORE_get1_certs(X509_STORE *store)
-{
- int i;
- STACK_OF(X509) *sk;
- STACK_OF(X509_OBJECT) *objs;
-
- if (store == NULL) {
- CMPerr(0, CMP_R_NULL_ARGUMENT);
- return 0;
- }
- if ((sk = sk_X509_new_null()) == NULL)
- return NULL;
- objs = X509_STORE_get0_objects(store);
- for (i = 0; i < sk_X509_OBJECT_num(objs); i++) {
- X509 *cert = X509_OBJECT_get0_X509(sk_X509_OBJECT_value(objs, i));
-
- if (cert != NULL) {
- if (!sk_X509_push(sk, cert))
- goto err;
- if (!X509_up_ref(cert)) {
- (void)sk_X509_pop(sk);
- goto err;
- }
- }
- }
- return sk;
-
- err:
- sk_X509_pop_free(sk, X509_free);
- return NULL;
-}
-
/*-
* Builds up the certificate chain of certs as high up as possible using
* the given list of certs containing all possible intermediate certificates and
return result;
}
+int ossl_cmp_sk_ASN1_UTF8STRING_push_str(STACK_OF(ASN1_UTF8STRING) *sk,
+ const char *text)
+{
+ ASN1_UTF8STRING *utf8string;
+
+ if (!ossl_assert(sk != NULL && text != NULL))
+ return 0;
+ if ((utf8string = ASN1_UTF8STRING_new()) == NULL)
+ return 0;
+ if (!ASN1_STRING_set(utf8string, text, -1))
+ goto err;
+ if (!sk_ASN1_UTF8STRING_push(sk, utf8string))
+ goto err;
+ return 1;
+
+ err:
+ ASN1_UTF8STRING_free(utf8string);
+ return 0;
+}
+
int ossl_cmp_asn1_octet_string_set1(ASN1_OCTET_STRING **tgt,
const ASN1_OCTET_STRING *src)
{
*tgt = new;
return 1;
}
+
+/*
+ * calculate a digest of the given certificate,
+ * using the same hash algorithm as in the certificate signature.
+ */
+ASN1_OCTET_STRING *OSSL_CMP_X509_digest(const X509 *cert)
+{
+ unsigned int len;
+ unsigned char hash[EVP_MAX_MD_SIZE];
+ int md_NID;
+ const EVP_MD *md = NULL;
+ ASN1_OCTET_STRING *new = NULL;
+
+ if (!ossl_assert(cert != NULL))
+ return NULL;
+
+ /*-
+ * select hash algorithm, as stated in CMP RFC 4210 Appendix F.
+ * Compilable ASN.1 defs:
+ * the hash of the certificate, using the same hash algorithm
+ * as is used to create and verify the certificate signature
+ */
+ if (!OBJ_find_sigid_algs(X509_get_signature_nid(cert), &md_NID, NULL)
+ || (md = EVP_get_digestbynid(md_NID)) == NULL) {
+ CMPerr(0, CMP_R_UNSUPPORTED_ALGORITHM);
+ return NULL;
+ }
+ if (!X509_digest(cert, md, hash, &len)
+ || (new = ASN1_OCTET_STRING_new()) == NULL)
+ return NULL;
+ if (!(ASN1_OCTET_STRING_set(new, hash, len))) {
+ ASN1_OCTET_STRING_free(new);
+ return NULL;
+ }
+ return new;
+}
projects / openssl.git / blobdiff