There is no registration, only enrollment

README.md

@@ -3,7 +3,7 @@ irmago
 
 **DO NOT USE!** This library is in heavy development and is in constant flux. It is not ready for use.
 
-Irmago is an IRMA client in Go: it can receive IRMA attributes, store them, disclose them to others, and use them to create attribute-based signatures. In more detail: 
+Irmago is an IRMA client in Go: it can receive IRMA attributes, store them, disclose them to others, and use them to create attribute-based signatures. In more detail:
 
  * It is the client (like the [IRMA Android app](https://github.com/credentials/irma_android_cardemu)) in the [IRMA protocol](https://credentials.github.io/protocols/irma-protocol/)
  * It parses [credential and issuer definitions and public keys](https://github.com/credentials/irma_configuration)

irmago_test.go

@@ -29,10 +29,10 @@ func TestMain(m *testing.M) {
 
 type IgnoringClientHandler struct{}
 
-func (i *IgnoringClientHandler) UpdateConfigurationStore(new *IrmaIdentifierSet)              {}
-func (i *IgnoringClientHandler) UpdateAttributes()                                            {}
-func (i *IgnoringClientHandler) RegistrationError(manager SchemeManagerIdentifier, err error) {}
-func (i *IgnoringClientHandler) RegistrationSuccess(manager SchemeManagerIdentifier)          {}
+func (i *IgnoringClientHandler) UpdateConfigurationStore(new *IrmaIdentifierSet)            {}
+func (i *IgnoringClientHandler) UpdateAttributes()                                          {}
+func (i *IgnoringClientHandler) EnrollmentError(manager SchemeManagerIdentifier, err error) {}
+func (i *IgnoringClientHandler) EnrollmentSuccess(manager SchemeManagerIdentifier)          {}
 
 func parseStorage(t *testing.T) *CredentialManager {
 	exists, err := PathExists("testdata/storage/test")

keyshare.go

@@ -46,7 +46,7 @@ type keyshareServer struct {
 	token      string
 }
 
-type keyshareRegistration struct {
+type keyshareEnrollment struct {
 	Username  string             `json:"username"`
 	Pin       string             `json:"pin"`
 	PublicKey *paillierPublicKey `json:"publicKey"`
@@ -141,8 +141,8 @@ func startKeyshareSession(
 	for managerID := range session.Identifiers().SchemeManagers {
 		if store.SchemeManagers[managerID].Distributed() {
 			ksscount++
-			if _, registered := keyshareServers[managerID]; !registered {
-				err := errors.New("Not registered to keyshare server of scheme manager " + managerID.String())
+			if _, enrolled := keyshareServers[managerID]; !enrolled {
+				err := errors.New("Not enrolled to keyshare server of scheme manager " + managerID.String())
 				sessionHandler.KeyshareError(err)
 				return
 			}

manager.go

@@ -54,10 +54,10 @@ type CredentialManager struct {
 }
 
 // KeyshareHandler is used for asking the user for his email address and PIN,
-// for registering at a keyshare server.
+// for enrolling at a keyshare server.
 type KeyshareHandler interface {
-	RegistrationError(manager SchemeManagerIdentifier, err error)
-	RegistrationSuccess(manager SchemeManagerIdentifier)
+	EnrollmentError(manager SchemeManagerIdentifier, err error)
+	EnrollmentSuccess(manager SchemeManagerIdentifier)
 }
 
 type ClientHandler interface {
@@ -77,7 +77,7 @@ type secretKey struct {
 // androidStoragePath is an optional path to the files of the old android app
 // (specify "" if you do not want to parse the old android app files),
 // and handler is used for informing the user of new stuff, and when a
-// registration to a keyshare server needs to happen.
+// enrollment to a keyshare server needs to happen.
 // The credential manager returned by this function has been fully deserialized
 // and is ready for use.
 //
@@ -602,15 +602,15 @@ func (cm *CredentialManager) unenrolledKeyshareServers() []SchemeManagerIdentifi
 	return list
 }
 
-// KeyshareEnroll attempts to register at the keyshare server of the specified scheme manager.
+// KeyshareEnroll attempts to enroll at the keyshare server of the specified scheme manager.
 func (cm *CredentialManager) KeyshareEnroll(manager SchemeManagerIdentifier, email, pin string) {
 	go func() {
 		err := cm.keyshareEnrollWorker(manager, email, pin)
 		cm.UnenrolledKeyshareServers = cm.unenrolledKeyshareServers()
 		if err != nil {
-			cm.handler.RegistrationError(manager, err)
+			cm.handler.EnrollmentError(manager, err)
 		} else {
-			cm.handler.RegistrationSuccess(manager)
+			cm.handler.EnrollmentSuccess(manager)
 		}
 	}()
 }
@@ -632,7 +632,7 @@ func (cm *CredentialManager) keyshareEnrollWorker(managerID SchemeManagerIdentif
 	if err != nil {
 		return err
 	}
-	message := keyshareRegistration{
+	message := keyshareEnrollment{
 		Username:  email,
 		Pin:       kss.HashedPin(pin),
 		PublicKey: (*paillierPublicKey)(&kss.PrivateKey.PublicKey),
@@ -648,7 +648,7 @@ func (cm *CredentialManager) keyshareEnrollWorker(managerID SchemeManagerIdentif
 	return cm.storage.StoreKeyshareServers(cm.keyshareServers)
 }
 
-// KeyshareRemove unregisters the keyshare server of the specified scheme manager.
+// KeyshareRemove unenrolls the keyshare server of the specified scheme manager.
 func (cm *CredentialManager) KeyshareRemove(manager SchemeManagerIdentifier) error {
 	if _, contains := cm.keyshareServers[manager]; !contains {
 		return errors.New("Can't uninstall unknown keyshare server")

session.go

@@ -26,7 +26,7 @@ type Handler interface {
 	Cancelled(action Action)
 	Failure(action Action, err *SessionError)
 	UnsatisfiableRequest(action Action, missing AttributeDisjunctionList)
-	MissingKeyshareServer(manager SchemeManagerIdentifier)
+	MissingKeyshareEnrollment(manager SchemeManagerIdentifier)
 
 	RequestIssuancePermission(request IssuanceRequest, ServerName string, callback PermissionHandler)
 	RequestVerificationPermission(request DisclosureRequest, ServerName string, callback PermissionHandler)
@@ -185,7 +185,7 @@ func (session *session) start() {
 		}
 	}
 
-	// Check if we are registered to all involved keyshare servers
+	// Check if we are enrolled into all involved keyshare servers
 	for id := range session.irmaSession.Identifiers().SchemeManagers {
 		manager, ok := session.credManager.ConfigurationStore.SchemeManagers[id]
 		if !ok {
@@ -193,10 +193,10 @@ func (session *session) start() {
 			return
 		}
 		distributed := manager.Distributed()
-		_, registered := session.credManager.keyshareServers[id]
-		if distributed && !registered {
+		_, enrolled := session.credManager.keyshareServers[id]
+		if distributed && !enrolled {
 			session.transport.Delete()
-			session.Handler.MissingKeyshareServer(id)
+			session.Handler.MissingKeyshareEnrollment(id)
 			return
 		}
 	}

session_test.go

@@ -20,7 +20,7 @@ type TestHandler struct {
 	manager *CredentialManager
 }
 
-func (th TestHandler) MissingKeyshareServer(manager SchemeManagerIdentifier) {
+func (th TestHandler) MissingKeyshareEnrollment(manager SchemeManagerIdentifier) {
 	th.Failure(ActionUnknown, &SessionError{Err: errors.Errorf("Missing keyshare server %s", manager.String())})
 }
 
@@ -194,23 +194,23 @@ func sessionHelper(t *testing.T, jwtcontents interface{}, url string, manager *C
 	}
 }
 
-func registerKeyshareServer(t *testing.T, manager *CredentialManager) {
+func enrollKeyshareServer(t *testing.T, manager *CredentialManager) {
 	bytes := make([]byte, 8, 8)
 	rand.Read(bytes)
 	email := fmt.Sprintf("%s@example.com", hex.EncodeToString(bytes))
 	require.NoError(t, manager.keyshareEnrollWorker(NewSchemeManagerIdentifier("test"), email, "12345"))
 }
 
-// Register a new account at the keyshare server and do an issuance, disclosure,
+// Enroll at a keyshare server and do an issuance, disclosure,
 // and issuance session, also using irma-demo credentials deserialized from Android storage
-func TestKeyshareRegistrationAndSessions(t *testing.T) {
+func TestKeyshareEnrollmentAndSessions(t *testing.T) {
 	manager := parseStorage(t)
 
 	manager.credentials[NewCredentialTypeIdentifier("test.test.mijnirma")] = map[int]*credential{}
 	test := NewSchemeManagerIdentifier("test")
 	err := manager.KeyshareRemove(test)
 	require.NoError(t, err)
-	registerKeyshareServer(t, manager)
+	enrollKeyshareServer(t, manager)
 
 	id := NewAttributeTypeIdentifier("irma-demo.RU.studentCard.studentID")
 	expiry := Timestamp(NewMetadataAttribute().Expiry())
@@ -249,9 +249,9 @@ func TestKeyshareRegistrationAndSessions(t *testing.T) {
 	teardown(t)
 }
 
-// Use the existing keyshare registration and credentials deserialized from Android storage
+// Use the existing keyshare enrollment and credentials deserialized from Android storage
 // in a keyshare session of each session type.
-// Use keyshareuser.sql to register the user at the keyshare server.
+// Use keyshareuser.sql to enroll the user at the keyshare server.
 func TestKeyshareSessions(t *testing.T) {
 	manager := parseStorage(t)
 	id := NewAttributeTypeIdentifier("irma-demo.RU.studentCard.studentID")