memset, memcpy, sizeof consistency fixes
[openssl.git] / crypto / ts / ts_req_utils.c
index 43280c15874e0f775e2f2977917ff78919901359..362e5e589a977e6429fc7c5b8312ea52067fc107 100644 (file)
@@ -1,6 +1,7 @@
 /* crypto/ts/ts_req_utils.c */
-/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
- * project 2002.
+/*
+ * Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
+ * 2002.
  */
 /* ====================================================================
  * Copyright (c) 2006 The OpenSSL Project.  All rights reserved.
@@ -10,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
 #include <openssl/ts.h>
 
 int TS_REQ_set_version(TS_REQ *a, long version)
-       {
-       return ASN1_INTEGER_set(a->version, version);
-       }
+{
+    return ASN1_INTEGER_set(a->version, version);
+}
 
 long TS_REQ_get_version(const TS_REQ *a)
-       {
-       return ASN1_INTEGER_get(a->version);
-       }
+{
+    return ASN1_INTEGER_get(a->version);
+}
 
 int TS_REQ_set_msg_imprint(TS_REQ *a, TS_MSG_IMPRINT *msg_imprint)
-       {
-       TS_MSG_IMPRINT *new_msg_imprint;
-
-       if (a->msg_imprint == msg_imprint)
-               return 1;
-       new_msg_imprint = TS_MSG_IMPRINT_dup(msg_imprint);
-       if (new_msg_imprint == NULL)
-               {
-               TSerr(TS_F_TS_REQ_SET_MSG_IMPRINT, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       TS_MSG_IMPRINT_free(a->msg_imprint);
-       a->msg_imprint = new_msg_imprint;
-       return 1;
-       }
+{
+    TS_MSG_IMPRINT *new_msg_imprint;
+
+    if (a->msg_imprint == msg_imprint)
+        return 1;
+    new_msg_imprint = TS_MSG_IMPRINT_dup(msg_imprint);
+    if (new_msg_imprint == NULL) {
+        TSerr(TS_F_TS_REQ_SET_MSG_IMPRINT, ERR_R_MALLOC_FAILURE);
+        return 0;
+    }
+    TS_MSG_IMPRINT_free(a->msg_imprint);
+    a->msg_imprint = new_msg_imprint;
+    return 1;
+}
 
 TS_MSG_IMPRINT *TS_REQ_get_msg_imprint(TS_REQ *a)
-       {
-       return a->msg_imprint;
-       }
+{
+    return a->msg_imprint;
+}
 
 int TS_MSG_IMPRINT_set_algo(TS_MSG_IMPRINT *a, X509_ALGOR *alg)
-       {
-       X509_ALGOR *new_alg;
-
-       if (a->hash_algo == alg)
-               return 1;
-       new_alg = X509_ALGOR_dup(alg);
-       if (new_alg == NULL)
-               {
-               TSerr(TS_F_TS_MSG_IMPRINT_SET_ALGO, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       X509_ALGOR_free(a->hash_algo);
-       a->hash_algo = new_alg;
-       return 1;
-       }
+{
+    X509_ALGOR *new_alg;
+
+    if (a->hash_algo == alg)
+        return 1;
+    new_alg = X509_ALGOR_dup(alg);
+    if (new_alg == NULL) {
+        TSerr(TS_F_TS_MSG_IMPRINT_SET_ALGO, ERR_R_MALLOC_FAILURE);
+        return 0;
+    }
+    X509_ALGOR_free(a->hash_algo);
+    a->hash_algo = new_alg;
+    return 1;
+}
 
 X509_ALGOR *TS_MSG_IMPRINT_get_algo(TS_MSG_IMPRINT *a)
-       {
-       return a->hash_algo;
-       }
+{
+    return a->hash_algo;
+}
 
 int TS_MSG_IMPRINT_set_msg(TS_MSG_IMPRINT *a, unsigned char *d, int len)
-       {
-       return ASN1_OCTET_STRING_set(a->hashed_msg, d, len);
-       }
+{
+    return ASN1_OCTET_STRING_set(a->hashed_msg, d, len);
+}
 
 ASN1_OCTET_STRING *TS_MSG_IMPRINT_get_msg(TS_MSG_IMPRINT *a)
-       {
-       return a->hashed_msg;
-       }
+{
+    return a->hashed_msg;
+}
 
 int TS_REQ_set_policy_id(TS_REQ *a, ASN1_OBJECT *policy)
-       {
-       ASN1_OBJECT *new_policy;
-
-       if (a->policy_id == policy)
-               return 1;
-       new_policy = OBJ_dup(policy);
-       if (new_policy == NULL)
-               {
-               TSerr(TS_F_TS_REQ_SET_POLICY_ID, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       ASN1_OBJECT_free(a->policy_id);
-       a->policy_id = new_policy;
-       return 1;
-       }
+{
+    ASN1_OBJECT *new_policy;
+
+    if (a->policy_id == policy)
+        return 1;
+    new_policy = OBJ_dup(policy);
+    if (new_policy == NULL) {
+        TSerr(TS_F_TS_REQ_SET_POLICY_ID, ERR_R_MALLOC_FAILURE);
+        return 0;
+    }
+    ASN1_OBJECT_free(a->policy_id);
+    a->policy_id = new_policy;
+    return 1;
+}
 
 ASN1_OBJECT *TS_REQ_get_policy_id(TS_REQ *a)
-       {
-       return a->policy_id;
-       }
+{
+    return a->policy_id;
+}
 
 int TS_REQ_set_nonce(TS_REQ *a, const ASN1_INTEGER *nonce)
-       {
-       ASN1_INTEGER *new_nonce;
-
-       if (a->nonce == nonce)
-               return 1;
-       new_nonce = ASN1_INTEGER_dup(nonce);
-       if (new_nonce == NULL)
-               {
-               TSerr(TS_F_TS_REQ_SET_NONCE, ERR_R_MALLOC_FAILURE);
-               return 0;
-               }
-       ASN1_INTEGER_free(a->nonce);
-       a->nonce = new_nonce;
-       return 1;
-       }
+{
+    ASN1_INTEGER *new_nonce;
+
+    if (a->nonce == nonce)
+        return 1;
+    new_nonce = ASN1_INTEGER_dup(nonce);
+    if (new_nonce == NULL) {
+        TSerr(TS_F_TS_REQ_SET_NONCE, ERR_R_MALLOC_FAILURE);
+        return 0;
+    }
+    ASN1_INTEGER_free(a->nonce);
+    a->nonce = new_nonce;
+    return 1;
+}
 
 const ASN1_INTEGER *TS_REQ_get_nonce(const TS_REQ *a)
-       {
-       return a->nonce;
-       }
+{
+    return a->nonce;
+}
 
 int TS_REQ_set_cert_req(TS_REQ *a, int cert_req)
-       {
-       a->cert_req = cert_req ? 0xFF : 0x00;
-       return 1;
-       }
+{
+    a->cert_req = cert_req ? 0xFF : 0x00;
+    return 1;
+}
 
 int TS_REQ_get_cert_req(const TS_REQ *a)
-       {
-       return a->cert_req ? 1 : 0;
-       }
+{
+    return a->cert_req ? 1 : 0;
+}
 
 STACK_OF(X509_EXTENSION) *TS_REQ_get_exts(TS_REQ *a)
-       {
-       return a->extensions;
-       }
+{
+    return a->extensions;
+}
 
 void TS_REQ_ext_free(TS_REQ *a)
-       {
-       if (!a) return;
-       sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free);
-       a->extensions = NULL;
-       }
+{
+    if (!a)
+        return;
+    sk_X509_EXTENSION_pop_free(a->extensions, X509_EXTENSION_free);
+    a->extensions = NULL;
+}
 
 int TS_REQ_get_ext_count(TS_REQ *a)
-       {
-       return X509v3_get_ext_count(a->extensions);
-       }
+{
+    return X509v3_get_ext_count(a->extensions);
+}
 
 int TS_REQ_get_ext_by_NID(TS_REQ *a, int nid, int lastpos)
-       {
-       return X509v3_get_ext_by_NID(a->extensions, nid, lastpos);
-       }
+{
+    return X509v3_get_ext_by_NID(a->extensions, nid, lastpos);
+}
 
 int TS_REQ_get_ext_by_OBJ(TS_REQ *a, ASN1_OBJECT *obj, int lastpos)
-       {
-       return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);
-       }
+{
+    return X509v3_get_ext_by_OBJ(a->extensions, obj, lastpos);
+}
 
 int TS_REQ_get_ext_by_critical(TS_REQ *a, int crit, int lastpos)
-       {
-       return X509v3_get_ext_by_critical(a->extensions, crit, lastpos);
-       }
+{
+    return X509v3_get_ext_by_critical(a->extensions, crit, lastpos);
+}
 
 X509_EXTENSION *TS_REQ_get_ext(TS_REQ *a, int loc)
-       {
-       return X509v3_get_ext(a->extensions,loc);
-       }
+{
+    return X509v3_get_ext(a->extensions, loc);
+}
 
 X509_EXTENSION *TS_REQ_delete_ext(TS_REQ *a, int loc)
-       {
-       return X509v3_delete_ext(a->extensions,loc);
-       }
+{
+    return X509v3_delete_ext(a->extensions, loc);
+}
 
 int TS_REQ_add_ext(TS_REQ *a, X509_EXTENSION *ex, int loc)
-       {
-       return X509v3_add_ext(&a->extensions,ex,loc) != NULL;
-       }
+{
+    return X509v3_add_ext(&a->extensions, ex, loc) != NULL;
+}
 
 void *TS_REQ_get_ext_d2i(TS_REQ *a, int nid, int *crit, int *idx)
-       {
-       return X509V3_get_d2i(a->extensions, nid, crit, idx);
-       }
+{
+    return X509V3_get_d2i(a->extensions, nid, crit, idx);
+}