From 10ee35e7fc764277f4c25ca7c1a4fb59b9aa042f Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Wed, 22 Jun 2016 16:18:36 -0400
Subject: [PATCH] Revert "Do some internal renaming in PKI"

This reverts commit 7ffa7deb92cef04ab8a87cadc9aba01951ad757e.
---
 builtin/logical/pki/cert_util.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/builtin/logical/pki/cert_util.go b/builtin/logical/pki/cert_util.go
index 6b2b966034..f35edc2cbb 100644
--- a/builtin/logical/pki/cert_util.go
+++ b/builtin/logical/pki/cert_util.go
@@ -23,10 +23,10 @@ import (
 type certUsage int
 
 const (
-	serverExtUsage certUsage = 1 << iota
-	clientExtUsage
-	codeSigningExtUsage
-	emailProtectionExtUsage
+	serverUsage certUsage = 1 << iota
+	clientUsage
+	codeSigningUsage
+	emailProtectionUsage
 	caUsage
 )
 
@@ -682,16 +682,16 @@ func generateCreationBundle(b *backend,
 	var usage certUsage
 	{
 		if role.ServerFlag {
-			usage = usage | serverExtUsage
+			usage = usage | serverUsage
 		}
 		if role.ClientFlag {
-			usage = usage | clientExtUsage
+			usage = usage | clientUsage
 		}
 		if role.CodeSigningFlag {
-			usage = usage | codeSigningExtUsage
+			usage = usage | codeSigningUsage
 		}
 		if role.EmailProtectionFlag {
-			usage = usage | emailProtectionExtUsage
+			usage = usage | emailProtectionUsage
 		}
 	}
 
@@ -747,16 +747,16 @@ func addKeyUsages(creationInfo *creationBundle, certTemplate *x509.Certificate)
 		return
 	}
 
-	if creationInfo.Usage&serverExtUsage != 0 {
+	if creationInfo.Usage&serverUsage != 0 {
 		certTemplate.ExtKeyUsage = append(certTemplate.ExtKeyUsage, x509.ExtKeyUsageServerAuth)
 	}
-	if creationInfo.Usage&clientExtUsage != 0 {
+	if creationInfo.Usage&clientUsage != 0 {
 		certTemplate.ExtKeyUsage = append(certTemplate.ExtKeyUsage, x509.ExtKeyUsageClientAuth)
 	}
-	if creationInfo.Usage&codeSigningExtUsage != 0 {
+	if creationInfo.Usage&codeSigningUsage != 0 {
 		certTemplate.ExtKeyUsage = append(certTemplate.ExtKeyUsage, x509.ExtKeyUsageCodeSigning)
 	}
-	if creationInfo.Usage&emailProtectionExtUsage != 0 {
+	if creationInfo.Usage&emailProtectionUsage != 0 {
 		certTemplate.ExtKeyUsage = append(certTemplate.ExtKeyUsage, x509.ExtKeyUsageEmailProtection)
 	}
 }